openstack
/
python-tripleoclient
Code Issues Proposed changes

Pass clients to get the get_password function 

This was missed in the recent password refactor.

Also:
* Clean up variable names to help distinguish between the previously
  globally defined 'clients' and sometimes locally overriden 'clients'
  variables.
* Update references to obsolete pre-refactor password names, used when
  creating overcloud endpoints outside of puppet.

Co-Authored-By: Julie Pichon <jpichon@redhat.com>
Change-Id: Icc94eea221b72387196ea22e516254073be57fd3
Closes-Bug: #1639174
This commit is contained in:
Dougal Matthews 2016-11-03 09:41:57 +00:00
parent 207bd4af9b
commit dc138a619a
3 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tripleoclient/constants.py
View File

@ -14,20 +14,20 @@
#
SERVICE_LIST = {
'aodh': {'password_field': 'OVERCLOUD_AODH_PASSWORD'},
'ceilometer': {'password_field': 'OVERCLOUD_CEILOMETER_PASSWORD'},
'cinder': {'password_field': 'OVERCLOUD_CINDER_PASSWORD'},
'cinderv2': {'password_field': 'OVERCLOUD_CINDER_PASSWORD'},
'glance': {'password_field': 'OVERCLOUD_GLANCE_PASSWORD'},
'gnocchi': {'password_field': 'OVERCLOUD_GNOCCHI_PASSWORD'},
'heat': {'password_field': 'OVERCLOUD_HEAT_PASSWORD'},
'aodh': {'password_field': 'AodhPassword'},
'ceilometer': {'password_field': 'CeilometerPassword'},
'cinder': {'password_field': 'CinderPassword'},
'cinderv2': {'password_field': 'CinderPassword'},
'glance': {'password_field': 'GlancePassword'},
'gnocchi': {'password_field': 'GnocchiPassword'},
'heat': {'password_field': 'HeatPassword'},
'heatcfn': {},
'ironic': {'password_field': 'OVERCLOUD_IRONIC_PASSWORD'},
'neutron': {'password_field': 'OVERCLOUD_NEUTRON_PASSWORD'},
'nova': {'password_field': 'OVERCLOUD_NOVA_PASSWORD'},
'swift': {'password_field': 'OVERCLOUD_SWIFT_PASSWORD'},
'sahara': {'password_field': 'OVERCLOUD_SAHARA_PASSWORD'},
'trove': {'password_field': 'OVERCLOUD_TROVE_PASSWORD'},
'ironic': {'password_field': 'IronicPassword'},
'neutron': {'password_field': 'NeutronPassword'},
'nova': {'password_field': 'NovaPassword'},
'swift': {'password_field': 'SwiftPassword'},
'sahara': {'password_field': 'SaharaPassword'},
'trove': {'password_field': 'TrovePassword'},
}
TRIPLEO_HEAT_TEMPLATES = "/usr/share/openstack-tripleo-heat-templates/"

18
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
View File

@ -1059,9 +1059,9 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
stack = mock.MagicMock()
stack.to_dict.return_value = fakes.FAKE_STACK
ip = '192.0.2.1'
overcloud_deploy.DeployOvercloud(None, None)._keystone_init(ip, ip,
None,
stack)
self.cmd._keystone_init(ip, ip, None, stack)
self.assertFalse(mock_init.called)
@mock.patch('tripleoclient.utils.get_password')
@ -1078,9 +1078,9 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
stack.to_dict.return_value = fakes.FAKE_STACK
ip = '192.0.2.1'
args = mock.Mock()
overcloud_deploy.DeployOvercloud(None, None)._keystone_init(ip, ip,
args,
stack)
self.cmd._keystone_init(ip, ip, args, stack)
self.assertTrue(mock_init.called)
@mock.patch('tripleoclient.utils.get_password')
@ -1099,9 +1099,9 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
stack.to_dict.return_value = fakes.FAKE_STACK
ip = '192.0.2.1'
args = mock.Mock()
overcloud_deploy.DeployOvercloud(None, None)._keystone_init(ip, ip,
args,
stack)
self.cmd._keystone_init(ip, ip, args, stack)
self.assertTrue(mock_init.called)
@mock.patch('tripleoclient.utils.check_nodes_count')

22
tripleoclient/v1/overcloud_deploy.py
View File

@ -32,7 +32,7 @@ from heatclient import exc as hc_exc
from keystoneclient import exceptions as kscexc
from os_cloud_config import keystone
from os_cloud_config import keystone_pki
from os_cloud_config.utils import clients
from os_cloud_config.utils import clients as occ_clients
from osc_lib.command import command
from osc_lib import exceptions as oscexc
from osc_lib.i18n import _
@ -509,9 +509,11 @@ class DeployOvercloud(command.Command):
# keystone.initialize.
keystone_tls_host = overcloud_ip_or_fqdn
keystone_client = clients.get_keystone_client(
keystone_client = occ_clients.get_keystone_client(
'admin',
utils.get_password(stack.stack_name, 'AdminPassword'),
utils.get_password(self.app.client_manager,
stack.stack_name,
'AdminPassword'),
'admin',
overcloud_endpoint)
@ -553,9 +555,13 @@ class DeployOvercloud(command.Command):
# TODO(rbrady): check usages of get_password
keystone.initialize(
keystone_admin_ip,
utils.get_password(stack.stack_name, 'AdminToken'),
utils.get_password(self.app.client_manager,
stack.stack_name,
'AdminToken'),
'admin@example.com',
utils.get_password(stack.stack_name, 'AdminPassword'),
utils.get_password(self.app.client_manager,
stack.stack_name,
'AdminPassword'),
ssl=keystone_tls_host,
public=overcloud_ip_or_fqdn,
user=parsed_args.overcloud_ssh_user,
@ -605,8 +611,10 @@ class DeployOvercloud(command.Command):
service_data = {}
password_field = data.get('password_field')
if password_field:
service_data['password'] = utils.get_password(stack.stack_name,
password_field)
service_data['password'] = utils.get_password(
self.app.client_manager,
stack.stack_name,
password_field)
# Set internal endpoint
service_name_internal = self._format_endpoint_name(service, 'internal')