diff options
author | spisarski <s.pisarski@cablelabs.com> | 2018-02-22 11:42:52 -0700 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2018-02-22 11:42:52 -0700 |
commit | c711acf8ae3e4ad6f746500747857bcc9fd6f7be (patch) | |
tree | 4eeba467b4f42b37e935ccfff6b547bd11c65778 /snaps/openstack/create_stack.py | |
parent | f3553913925b8ee5869c8e06047d6e4161a968c7 (diff) |
Changed pattern on how objects lookup themselves by name and project.
The pattern being replaced has unwittingly added the requirement that
all creator credentials must be of type 'admin' as when looking up
the associated project ID required a call to keystone.projects.list().
As the SNAPS integration tests were always creating users with an 'admin'
role, this issue was not caught. As part of this patch, integration test
users will no longer be admin.
JIRA: SNAPS-274
Change-Id: I02957f69e31a9d4dfa63362d371f061687e59fbf
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/create_stack.py')
-rw-r--r-- | snaps/openstack/create_stack.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/snaps/openstack/create_stack.py b/snaps/openstack/create_stack.py index 99d2925..c5c509f 100644 --- a/snaps/openstack/create_stack.py +++ b/snaps/openstack/create_stack.py @@ -29,7 +29,7 @@ from snaps.openstack.create_volume import OpenStackVolume from snaps.openstack.create_volume_type import OpenStackVolumeType from snaps.openstack.openstack_creator import OpenStackCloudObject from snaps.openstack.utils import ( - nova_utils, settings_utils, glance_utils, cinder_utils) + nova_utils, settings_utils, glance_utils, cinder_utils, keystone_utils) from snaps.openstack.create_network import OpenStackNetwork from snaps.openstack.utils import heat_utils, neutron_utils @@ -283,17 +283,20 @@ class OpenStackHeatStack(OpenStackCloudObject, object): """ out = list() + nova = nova_utils.nova_client(self._os_creds) + keystone = keystone_utils.keystone_client(self._os_creds) neutron = neutron_utils.neutron_client(self._os_creds) - stack_servers = heat_utils.get_stack_servers( - self.__heat_cli, nova, neutron, self.__stack, self.project_id) + self.__heat_cli, nova, neutron, keystone, self.__stack, + self._os_creds.project_name) glance = glance_utils.glance_client(self._os_creds) for stack_server in stack_servers: vm_inst_settings = settings_utils.create_vm_inst_config( - nova, neutron, stack_server, self.project_id) + nova, keystone, neutron, stack_server, + self._os_creds.project_name) image_settings = settings_utils.determine_image_config( glance, stack_server, self.image_settings) keypair_settings = settings_utils.determine_keypair_config( |