openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Remove nodes.json update from overcloud deploy"

This commit is contained in:
Dougal Matthews 2015-08-25 17:33:46 +02:00 committed by Gerrit Code Review
parent 68eabe7f8e 44f5041a24
commit 2b681b6818
2 changed files with 4 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rdomanager_oscplugin/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -39,8 +39,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_postconfig')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_update_nodesjson')
@mock.patch('rdomanager_oscplugin.utils.generate_overcloud_passwords')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_create_overcloudrc')
@ -73,7 +71,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_sleep, mock_setup_endpoints,
mock_create_overcloudrc,
mock_generate_overcloud_passwords,
mock_update_nodesjson,
mock_deploy_postconfig):
arglist = ['--templates', '--ceph-storage-scale', '3']
@ -175,8 +172,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_postconfig')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_update_nodesjson')
@mock.patch('rdomanager_oscplugin.utils.generate_overcloud_passwords')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_create_overcloudrc')
@ -209,7 +204,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_sleep, mock_setup_endpoints,
mock_create_overcloudrc,
mock_generate_overcloud_passwords,
mock_update_nodesjson,
mock_deploy_postconfig):
arglist = ['--templates', '--ceph-storage-scale', '3']
@ -324,8 +318,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_postconfig')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_update_nodesjson')
@mock.patch('rdomanager_oscplugin.utils.generate_overcloud_passwords')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_create_overcloudrc')
@ -357,7 +349,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_sleep, mock_setup_endpoints,
mock_create_overcloudrc,
mock_generate_overcloud_passwords,
mock_update_nodesjson,
mock_deploy_postconfig):
arglist = ['--templates', '/home/stack/tripleo-heat-templates']
@ -414,8 +405,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_postconfig')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_update_nodesjson')
@mock.patch('rdomanager_oscplugin.utils.get_config_value', autospec=True)
@mock.patch('rdomanager_oscplugin.utils.generate_overcloud_passwords')
@mock.patch('heatclient.common.template_utils.'
@ -434,7 +423,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_get_templte_contents,
mock_process_multiple_env,
mock_generate_overcloud_passwords,
mock_get_key, mock_update_nodesjson,
mock_get_key,
mock_deploy_postconfig):
arglist = ['--plan', 'undercloud', '--output-dir', 'fake',
@ -524,8 +513,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_postconfig')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_update_nodesjson')
@mock.patch('rdomanager_oscplugin.utils.get_config_value', autospec=True)
@mock.patch('rdomanager_oscplugin.utils.generate_overcloud_passwords')
@mock.patch('heatclient.common.template_utils.'
@ -544,7 +531,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_get_templte_contents,
mock_process_multiple_env,
mock_generate_overcloud_passwords,
mock_get_key, mock_update_nodesjson,
mock_get_key,
mock_deploy_postconfig):
arglist = ['--plan', 'undercloud', '--output-dir', 'fake',
@ -633,8 +620,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_postconfig')
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_update_nodesjson')
@mock.patch('rdomanager_oscplugin.utils.get_config_value', autospec=True)
@mock.patch('rdomanager_oscplugin.utils.generate_overcloud_passwords')
@mock.patch('heatclient.common.template_utils.'
@ -654,7 +639,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_get_templte_contents,
mock_process_multiple_env,
mock_generate_overcloud_passwords,
mock_get_key, mock_update_nodesjson,
mock_get_key,
mock_deploy_postconfig):
arglist = ['--plan', 'undercloud', '--output-dir', 'fake',
@ -805,8 +790,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
self.assertFalse(mock_deploy_tht.called)
self.assertFalse(mock_deploy_tuskar.called)
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_update_nodesjson', autospec=True)
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
'_create_overcloudrc', autospec=True)
@mock.patch('rdomanager_oscplugin.v1.overcloud_deploy.DeployOvercloud.'
@ -819,7 +802,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
'_pre_heat_deploy', autospec=True)
def test_rhel_reg_params_provided(self, mock_pre_deploy, mock_deploy_tht,
mock_deploy_tuskar, mock_oc_endpoint,
mock_create_ocrc, mock_update_njson):
mock_create_ocrc):
arglist = ['--templates', '--rhel-reg',
'--reg-sat-url', 'https://example.com',
@ -839,5 +822,4 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
self.assertTrue(mock_deploy_tht.called)
self.assertTrue(mock_oc_endpoint.called)
self.assertTrue(mock_create_ocrc.called)
self.assertTrue(mock_update_njson.called)
self.assertFalse(mock_deploy_tuskar.called)

21
rdomanager_oscplugin/v1/overcloud_deploy.py
View File

@ -14,7 +14,6 @@
#
from __future__ import print_function
import json
import logging
import os
import re
@ -602,20 +601,6 @@ class DeployOvercloud(command.Command):
f.write("export %(key)s=%(value)s\n" %
{'key': key, 'value': value})
def _update_nodesjson(self, stack):
with open("instackenv.json") as f:
instack_env = json.load(f)
instack_env.setdefault('overcloud', {})
instack_env['overcloud']['password'] = (
self.passwords['OVERCLOUD_ADMIN_PASSWORD'])
instack_env['overcloud']['endpoint'] = (
self._get_overcloud_endpoint(stack))
with open("instackenv.json", "w") as f:
json.dump(instack_env, f)
def _deploy_postconfig(self, stack, parsed_args):
self.log.debug("_deploy_postconfig(%s)" % parsed_args)
@ -738,10 +723,6 @@ class DeployOvercloud(command.Command):
'--tripleo-root',
default=os.environ.get('TRIPLEO_ROOT', '/etc/tripleo')
)
parser.add_argument(
'--nodes-json',
default=os.environ.get('NODES_JSON', 'instackenv.json')
)
parser.add_argument(
'--no-proxy',
default=os.environ.get('no_proxy', '')
@ -836,8 +817,6 @@ class DeployOvercloud(command.Command):
self._create_overcloudrc(stack, parsed_args)
self._update_nodesjson(stack)
if stack_create:
self._deploy_postconfig(stack, parsed_args)