diff --git a/lower-constraints.txt b/lower-constraints.txt index 532b5acbe..bf6c76c20 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -147,7 +147,7 @@ testscenarios===0.4 testtools==2.2.0 tooz==1.58.0 traceback2==1.4.0 -tripleo-common==10.6.1 +tripleo-common==10.7.0 ujson==1.35 unittest2==1.1.0 vine==1.1.4 diff --git a/requirements.txt b/requirements.txt index 51e2d4136..3f5c93290 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,5 +16,5 @@ simplejson>=3.5.1 # MIT six>=1.10.0 # MIT osc-lib>=1.8.0 # Apache-2.0 websocket-client>=0.44.0 # LGPLv2+ -tripleo-common>=10.6.1 # Apache-2.0 +tripleo-common>=10.7.0 # Apache-2.0 cryptography>=2.1 # BSD/Apache-2.0 diff --git a/tripleoclient/v1/tripleo_deploy.py b/tripleoclient/v1/tripleo_deploy.py index 4892c0c29..3c17102be 100644 --- a/tripleoclient/v1/tripleo_deploy.py +++ b/tripleoclient/v1/tripleo_deploy.py @@ -45,6 +45,7 @@ from tripleoclient import utils from tripleo_common import constants as tc_constants from tripleo_common.image import kolla_builder +from tripleo_common.utils import parameters from tripleo_common.utils import passwords as password_utils # For ansible download and config generation @@ -794,6 +795,7 @@ class Deploy(command.Command): cleanup=parsed_args.cleanup) self._prepare_container_images(env, roles_data) + parameters.convert_docker_params(env) self.log.debug(_("Getting template contents")) template_path = os.path.join(self.tht_render, 'overcloud.yaml')