openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Remove --standalone option"

This commit is contained in:
Zuul 2021-09-07 20:59:41 +00:00 committed by Gerrit Code Review
parent 361347501c 5cbc2b8ef1
commit fe00b2b0df
6 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/remove-standalone-paramter-e7f4d978c7f6261c.yaml Normal file
View File

@ -0,0 +1,4 @@
---
other:
- |
Removed --standalone from `openstack tripleo deploy` command.

4
tripleoclient/tests/v1/undercloud/minion/test_config.py
View File

@ -51,7 +51,7 @@ class TestMinionDeploy(base.TestCase):
cmd = minion_config.prepare_minion_deploy()
expected_cmd = ['sudo', '--preserve-env',
'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role',
'--standalone-role',
'UndercloudMinion', '--stack', 'minion',
'-r',
'/usr/share/openstack-tripleo-heat-templates/roles/'
@ -128,7 +128,7 @@ class TestMinionDeploy(base.TestCase):
cmd = minion_config.prepare_minion_deploy()
expected_cmd = ['sudo', '--preserve-env',
'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role',
'--standalone-role',
'UndercloudMinion', '--stack', 'minion',
'-r', '/foo/roles/UndercloudMinion.yaml',
'--local-ip=1.1.1.1/24',

24
tripleoclient/tests/v1/undercloud/test_install_upgrade.py
View File

@ -75,7 +75,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -141,7 +141,7 @@ class TestUndercloudInstall(TestPluginV1):
])
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usertht',
@ -295,7 +295,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -362,7 +362,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -422,7 +422,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -479,7 +479,7 @@ class TestUndercloudInstall(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -569,7 +569,7 @@ class TestUndercloudUpgrade(TestPluginV1):
)
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -657,7 +657,7 @@ class TestUndercloudUpgrade(TestPluginV1):
self.cmd.take_action(parsed_args)
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -721,7 +721,7 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -784,7 +784,7 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -845,7 +845,7 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--standalone-role', 'Undercloud', '--stack',
'undercloud', '--local-domain=localdomain',
'--local-ip=192.168.24.1/24',
'--templates=/usr/share/openstack-tripleo-heat-templates/',
@ -912,7 +912,7 @@ class TestUndercloudUpgrade(TestPluginV1):
mock_subprocess.assert_called_with(
['sudo', '--preserve-env', 'openstack', 'tripleo', 'deploy',
'--standalone', '--standalone-role', 'Undercloud', '--stack',
'--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/minion_config.py
View File

@ -360,7 +360,7 @@ def prepare_minion_deploy(upgrade=False, no_validations=False,
roles_file = os.path.join(tht_templates, constants.MINION_ROLES_FILE)
cmd = ["sudo", "--preserve-env", "openstack", "tripleo", "deploy",
"--standalone", "--standalone-role", "UndercloudMinion", "--stack",
"--standalone-role", "UndercloudMinion", "--stack",
"minion", "-r", roles_file]
cmd += deploy_args[:]

5
tripleoclient/v1/tripleo_deploy.py
View File

@ -886,11 +886,6 @@ class Deploy(command.Command):
help=_("The directory containing the Heat templates to deploy"),
default=constants.TRIPLEO_HEAT_TEMPLATES
)
parser.add_argument('--standalone', default=False, action='store_true',
help=_("DEPRECATED. The --standalone argument is "
"now deprecated. Standalone deployments "
"can now be run without passing "
"--standalone. "))
parser.add_argument('--upgrade', default=False, action='store_true',
help=_("Upgrade an existing deployment."))
parser.add_argument('-y', '--yes', default=False, action='store_true',

2
tripleoclient/v1/undercloud_config.py
View File

@ -831,7 +831,7 @@ def prepare_undercloud_deploy(upgrade=False, no_validations=True,
deploy_args += ["--force-stack-update"]
cmd = ["sudo", "--preserve-env", "openstack", "tripleo", "deploy",
"--standalone", "--standalone-role", "Undercloud", "--stack",
"--standalone-role", "Undercloud", "--stack",
"undercloud"]
cmd += deploy_args[:]