openstack
/
python-tripleoclient
Code Issues Proposed changes

undercloud upgrade: include UndercloudUpgrade service 

It's required to upgrade rpms during the containerized underclou
dupgrade.

Change-Id: Ic0884159c6ec6bcc9321b548ef287e816a2735e0
This commit is contained in:
Emilien Macchi 2018-05-15 16:39:48 -07:00
parent dc5fbd8996
commit ae92c78aea
2 changed files with 11 additions and 3 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

@ -438,7 +438,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--upgrade',
'--upgrade', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'lifecycle/undercloud-upgrade-prepare.yaml',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',
@ -495,7 +497,9 @@ class TestUndercloudUpgrade(TestPluginV1):
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--upgrade',
'--upgrade', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'lifecycle/undercloud-upgrade-prepare.yaml',
'--heat-native', '-e',
'/usr/share/openstack-tripleo-heat-templates/environments/'
'docker.yaml', '-e',

6
tripleoclient/v1/undercloud_config.py
View File

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