Merge "nova-less-deploy: update to metalsmith 0.13"

lower-constraints.txt

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

requirements.txt

@@ -30,6 +30,6 @@ python-keystoneclient>=3.8.0 # Apache-2.0
 keystoneauth1>=3.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
-metalsmith>=0.9.0 # Apache-2.0
+metalsmith>=0.13.0 # Apache-2.0
 jsonschema>=2.6.0 # MIT
 requests>=2.18.0,!=2.20.0  # Apache-2.0

tripleo_common/actions/baremetal_deploy.py

@@ -17,6 +17,7 @@ import logging
 
 import jsonschema
 import metalsmith
+from metalsmith import instance_config
 from metalsmith import sources
 from mistral_lib import actions
 from openstack import exceptions as sdk_exc
@@ -224,7 +225,7 @@ class DeployNodeAction(base.TripleOAction):
         super(DeployNodeAction, self).__init__()
         self.instance = instance
         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.default_image = default_image
         self.default_network = default_network