openstack
/
python-tripleoclient
Code Issues Proposed changes

Rename default stack name for standalone 

Move the undercloud stack name into the undercloud installation rather
than have it be the default for the standalone deployment method.

Change-Id: Ic63e3115c53bfa533ec0ca93767ceff848c32bd2
Related-Blueprint: all-in-one
This commit is contained in:
Alex Schultz 2018-06-25 10:27:49 -06:00
parent 3726c7750f
commit 93f7f18dd9
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_os.assert_called_with('/foo/tripleo-config-generated-env-files')
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--standalone-role', 'Undercloud',
'--standalone-role', 'Undercloud', '--stack', 'undercloud',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -235,7 +235,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--standalone-role', 'Undercloud',
'--standalone-role', 'Undercloud', '--stack', 'undercloud',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -296,7 +296,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--standalone-role', 'Undercloud',
'--standalone-role', 'Undercloud', '--stack', 'undercloud',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -352,7 +352,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--standalone-role', 'Undercloud',
'--standalone-role', 'Undercloud', '--stack', 'undercloud',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -445,7 +445,7 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--standalone-role', 'Undercloud',
'--standalone-role', 'Undercloud', '--stack', 'undercloud',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -502,7 +502,7 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--standalone-role', 'Undercloud',
'--standalone-role', 'Undercloud', '--stack', 'undercloud',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -563,7 +563,7 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', 'openstack', 'tripleo', 'deploy', '--standalone',
'--standalone-role', 'Undercloud',
'--standalone-role', 'Undercloud', '--stack', 'undercloud',
'--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',

2
tripleoclient/v1/tripleo_deploy.py
View File

@ -673,7 +673,7 @@ class Deploy(command.Command):
help=_("Skip yes/no prompt (assume yes)."))
parser.add_argument('--stack',
help=_("Stack name to create"),
default='undercloud')
default='standalone')
parser.add_argument('--output-dir',
dest='output_dir',
help=_("Directory to output state, processed heat "

2
tripleoclient/v1/undercloud_config.py
View File

@ -562,7 +562,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=False,
deploy_args.append('--log-file=' + LOG_FILE)
cmd = ["sudo", "openstack", "tripleo", "deploy", "--standalone",
"--standalone-role", "Undercloud"]
"--standalone-role", "Undercloud", "--stack", "undercloud"]
cmd += deploy_args[:]
return cmd