openstack
/
python-tripleoclient
Code Issues Proposed changes

Switch undercloud to consume upgrade_tasks from THT 

This patch enables the containerized undercloud to run
'openstack tripleo deploy --upgrade' so we can consume Ansible
upgrade_tasks from THT and reduce the code overlap with upgrade logic
from undercloud and overcloud.

Change-Id: Id25e6280b4b4f060d5e3f78a50ff83aaca9e6b1a
This commit is contained in:
Emilien Macchi 2018-05-03 12:14:36 -07:00 committed by Alex Schultz
parent df9cbd400e
commit de185c97f0
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/tests/v1/undercloud/test_undercloud.py
View File

@ -436,9 +436,7 @@ class TestUndercloudUpgrade(TestPluginV1):
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'lifecycle/undercloud-upgrade-prepare.yaml',
'--upgrade',
'--heat-native', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',
@ -494,9 +492,7 @@ class TestUndercloudUpgrade(TestPluginV1):
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'lifecycle/undercloud-upgrade-prepare.yaml',
'--upgrade',
'--heat-native', '-e', '/home/stack/foo.yaml', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'services/ironic.yaml',

4
tripleoclient/v1/undercloud_config.py
View File

@ -329,9 +329,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
deploy_args.append('--roles-file=%s' % CONF['roles_file'])
if upgrade:
deploy_args += ['-e', os.path.join(
tht_templates,
"environments/lifecycle/undercloud-upgrade-prepare.yaml")]
deploy_args += ['--upgrade']
if CONF.get('heat_native', None):
deploy_args.append('--heat-native')