diff options
Diffstat (limited to 'snaps/openstack/create_security_group.py')
| -rw-r--r-- | snaps/openstack/create_security_group.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/snaps/openstack/create_security_group.py b/snaps/openstack/create_security_group.py index 52ea9dc..eecf789 100644 --- a/snaps/openstack/create_security_group.py +++ b/snaps/openstack/create_security_group.py @@ -56,9 +56,10 @@ class OpenStackSecurityGroup(OpenStackNetworkObject): """ super(self.__class__, self).initialize() + keystone = keystone_utils.keystone_client(self._os_creds) self.__security_group = neutron_utils.get_security_group( - self._neutron, sec_grp_settings=self.sec_grp_settings, - project_id=self.project_id) + self._neutron, keystone, sec_grp_settings=self.sec_grp_settings, + project_name=self._os_creds.project_name) if self.__security_group: # Populate rules existing_rules = neutron_utils.get_rules_by_security_group( @@ -87,8 +88,7 @@ class OpenStackSecurityGroup(OpenStackNetworkObject): keystone = keystone_utils.keystone_client(self._os_creds) self.__security_group = neutron_utils.create_security_group( - self._neutron, keystone, self.sec_grp_settings, - project_id=self.project_id) + self._neutron, keystone, self.sec_grp_settings) # Get the rules added for free auto_rules = neutron_utils.get_rules_by_security_group( @@ -104,7 +104,8 @@ class OpenStackSecurityGroup(OpenStackNetworkObject): for sec_grp_rule_setting in self.sec_grp_settings.rule_settings: try: custom_rule = neutron_utils.create_security_group_rule( - self._neutron, sec_grp_rule_setting, self.project_id) + self._neutron, keystone, sec_grp_rule_setting, + self._os_creds.project_name) self.__rules[sec_grp_rule_setting] = custom_rule except Conflict as e: logger.warn('Unable to create rule due to conflict - %s', @@ -180,8 +181,9 @@ class OpenStackSecurityGroup(OpenStackNetworkObject): :param rule_setting: the rule configuration """ rule_setting.sec_grp_name = self.sec_grp_settings.name + keystone = keystone_utils.keystone_client(self._os_creds) new_rule = neutron_utils.create_security_group_rule( - self._neutron, rule_setting, self.project_id) + self._neutron, keystone, rule_setting, self._os_creds.project_name) self.__rules[rule_setting] = new_rule self.sec_grp_settings.rule_settings.append(rule_setting) |