| garciadeblas | 1562e96 | 2024-04-09 11:18:12 +0200 | [diff] [blame] | 1 | ####################################################################################### |
| 2 | # Copyright ETSI Contributors and Others. |
| 3 | # |
| 4 | # Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | # you may not use this file except in compliance with the License. |
| 6 | # You may obtain a copy of the License at |
| 7 | # |
| 8 | # http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | # |
| 10 | # Unless required by applicable law or agreed to in writing, software |
| 11 | # distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
| 13 | # implied. |
| 14 | # See the License for the specific language governing permissions and |
| 15 | # limitations under the License. |
| 16 | ####################################################################################### |
| 17 | --- |
| 18 | fixes: |
| 19 | - | |
| 20 | This fixes bug 2217. Modified the cloud-init merge configs and defined |
| 21 | the default SSH keys within the system_info instead of users. |
| 22 | This bug fix doesn't break the creation of virtual machines that have |
| 23 | a config drive. Now the merge_how dictionary is only appended to the user |
| 24 | data in those cases where there is no config drive. |
| 25 | |