openstack/python-tripleoclient
Code Issues Proposed changes

Wire in convert_docker_params

Browse Source 
This converts Docker*Image params into
Container*Image varients when using tripleo deploy.

In the future we can use it for a few other ad-hoc
Docker* variable substitutions as well to make things
more generic.

Change-Id: Ib1dc0c08ce7971a03639acc42b1e738d93a52f98
This commit is contained in:
Dan Prince 2019-04-10 10:47:34 -04:00 committed by Alex Schultz
parent 6aa1902322
commit 50744f7c22
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lower-constraints.txt
View File

@ -147,7 +147,7 @@ testscenarios===0.4
testtools==2.2.0 testtools==2.2.0
tooz==1.58.0 tooz==1.58.0
traceback2==1.4.0 traceback2==1.4.0
tripleo-common==10.6.1 tripleo-common==10.7.0
ujson==1.35 ujson==1.35
unittest2==1.1.0 unittest2==1.1.0
vine==1.1.4 vine==1.1.4

2
requirements.txt
View File

@ -16,5 +16,5 @@ simplejson>=3.5.1 # MIT
six>=1.10.0 # MIT six>=1.10.0 # MIT
osc-lib>=1.8.0 # Apache-2.0 osc-lib>=1.8.0 # Apache-2.0
websocket-client>=0.44.0 # LGPLv2+ 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 cryptography>=2.1 # BSD/Apache-2.0

2
tripleoclient/v1/tripleo_deploy.py
View File

@ -45,6 +45,7 @@ from tripleoclient import utils
from tripleo_common import constants as tc_constants from tripleo_common import constants as tc_constants
from tripleo_common.image import kolla_builder from tripleo_common.image import kolla_builder
from tripleo_common.utils import parameters
from tripleo_common.utils import passwords as password_utils from tripleo_common.utils import passwords as password_utils
# For ansible download and config generation # For ansible download and config generation
@ -794,6 +795,7 @@ class Deploy(command.Command):
cleanup=parsed_args.cleanup) cleanup=parsed_args.cleanup)
self._prepare_container_images(env, roles_data) self._prepare_container_images(env, roles_data)
parameters.convert_docker_params(env)
self.log.debug(_("Getting template contents")) self.log.debug(_("Getting template contents"))
template_path = os.path.join(self.tht_render, 'overcloud.yaml') template_path = os.path.join(self.tht_render, 'overcloud.yaml')