openstack
/
tripleo-common
Code Issues Proposed changes

nova-less-deploy: update to metalsmith 0.13 

InstanceConfig was deprecated in favour of GenericConfig and CloudInitConfig
to make it clear which format is used. We use the latter.

Implements: blueprint nova-less-deploy
Change-Id: I8b6671d9b0813e04fbe5fb3c9a3009117b82064c
This commit is contained in:
Dmitry Tantsur 2019-07-24 09:29:19 +02:00
parent 928c6771cc
commit 9b40aa8a4c
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -34,7 +34,7 @@ keystoneauth1==3.4.0
linecache2==1.0.0 linecache2==1.0.0
MarkupSafe==1.0 MarkupSafe==1.0
mccabe==0.2.1 mccabe==0.2.1
metalsmith==0.9.0 metalsmith==0.13.0
mistral-lib==0.3.0 mistral-lib==0.3.0
mock==2.0.0 mock==2.0.0
monotonic==0.6 monotonic==0.6

2
requirements.txt
View File

@ -30,6 +30,6 @@ python-keystoneclient>=3.8.0 # Apache-2.0
keystoneauth1>=3.4.0 # Apache-2.0 keystoneauth1>=3.4.0 # Apache-2.0
tenacity>=4.4.0 # Apache-2.0 tenacity>=4.4.0 # Apache-2.0
futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
metalsmith>=0.9.0 # Apache-2.0 metalsmith>=0.13.0 # Apache-2.0
jsonschema>=2.6.0 # MIT jsonschema>=2.6.0 # MIT
requests>=2.18.0,!=2.20.0 # Apache-2.0 requests>=2.18.0,!=2.20.0 # Apache-2.0

3
tripleo_common/actions/baremetal_deploy.py
View File

@ -17,6 +17,7 @@ import logging
import jsonschema import jsonschema
import metalsmith import metalsmith
from metalsmith import instance_config
from metalsmith import sources from metalsmith import sources
from mistral_lib import actions from mistral_lib import actions
from openstack import exceptions as sdk_exc from openstack import exceptions as sdk_exc
@ -224,7 +225,7 @@ class DeployNodeAction(base.TripleOAction):
super(DeployNodeAction, self).__init__() super(DeployNodeAction, self).__init__()
self.instance = instance self.instance = instance
self.node = node self.node = node
self.config = metalsmith.InstanceConfig(ssh_keys=ssh_keys) self.config = instance_config.CloudInitConfig(ssh_keys=ssh_keys)
self.config.add_user(ssh_user_name, admin=True, sudo=True) self.config.add_user(ssh_user_name, admin=True, sudo=True)
self.default_image = default_image self.default_image = default_image
self.default_network = default_network self.default_network = default_network