| ####################################################################################### |
| # Copyright ETSI Contributors and Others. |
| # |
| # Licensed under the Apache License, Version 2.0 (the "License"); |
| # you may not use this file except in compliance with the License. |
| # You may obtain a copy of the License at |
| # |
| # http://www.apache.org/licenses/LICENSE-2.0 |
| # |
| # Unless required by applicable law or agreed to in writing, software |
| # distributed under the License is distributed on an "AS IS" BASIS, |
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
| # implied. |
| # See the License for the specific language governing permissions and |
| # limitations under the License. |
| ####################################################################################### |
| --- |
| fixes: |
| - | |
| This fixes bug 2217. Modified the cloud-init merge configs and defined |
| the default SSH keys within the system_info instead of users. |
| This bug fix doesn't break the creation of virtual machines that have |
| a config drive. Now the merge_how dictionary is only appended to the user |
| data in those cases where there is no config drive. |
| |