openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Update undercloud install to use tripleo deploy"

This commit is contained in:
Zuul 2018-05-02 03:08:19 +00:00 committed by Gerrit Code Review
parent 37c0963aa3 cad736b6ea
commit d5ee7a6cff
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,8 +71,8 @@ class TestUndercloudInstall(TestPluginV1):
mock_os.assert_called_with('/foo')
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'undercloud',
'deploy', '--local-domain=localdomain',
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e', '/home/stack/foo.yaml', '-e',
@ -128,8 +128,8 @@ class TestUndercloudInstall(TestPluginV1):
self.cmd.app_args.verbose_level = old_verbose
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'undercloud',
'deploy', '--local-domain=localdomain',
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e', '/home/stack/foo.yaml', '-e',
@ -183,8 +183,8 @@ class TestUndercloudInstall(TestPluginV1):
self.cmd.take_action(parsed_args)
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'undercloud',
'deploy', '--local-domain=localdomain',
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'--heat-native', '-e', '/home/stack/foo.yaml', '-e',
@ -275,8 +275,8 @@ class TestUndercloudUpgrade(TestPluginV1):
self.cmd.take_action(parsed_args)
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'undercloud',
'deploy', '--local-domain=localdomain',
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'-e',
@ -335,8 +335,8 @@ class TestUndercloudUpgrade(TestPluginV1):
self.cmd.app_args.verbose_level = old_verbose
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'undercloud',
'deploy', '--local-domain=localdomain',
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
'-e',

2
tripleoclient/v1/undercloud_config.py
View File

@ -833,7 +833,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
LOG_FILE = os.path.join(os.getcwd() + '/install-undercloud.log')
deploy_args.append('--log-file=' + LOG_FILE)
cmd = ["sudo", "openstack", "undercloud", "deploy"]
cmd = ["sudo", "openstack", "tripleo", "deploy", "--standalone"]
cmd += deploy_args[:]
return cmd