diff --git a/plugins/modules/security_group.py b/plugins/modules/security_group.py index 721bf61f..5502b3e8 100644 --- a/plugins/modules/security_group.py +++ b/plugins/modules/security_group.py @@ -439,7 +439,7 @@ class SecurityGroupModule(OpenStackModule): def _generate_security_group_rule(params): prototype = dict( (k, params[k]) - for k in ['direction', 'remote_ip_prefix'] + for k in ['description', 'direction', 'remote_ip_prefix'] if params[k] is not None) # When remote_ip_prefix is missing a netmask, then Neutron will add @@ -521,17 +521,17 @@ class SecurityGroupModule(OpenStackModule): return security_group def _update_security_group_rules(self, security_group, update): - create_security_group_rules = update.get('create_security_group_rules') - if create_security_group_rules: - self.conn.network.\ - create_security_group_rules(create_security_group_rules) - delete_security_group_rules = update.get('delete_security_group_rules') if delete_security_group_rules: for security_group_rule in delete_security_group_rules: self.conn.network.\ delete_security_group_rule(security_group_rule['id']) + create_security_group_rules = update.get('create_security_group_rules') + if create_security_group_rules: + self.conn.network.\ + create_security_group_rules(create_security_group_rules) + if create_security_group_rules or delete_security_group_rules: # Update security group with created and deleted rules return self.conn.network.get_security_group(security_group.id) diff --git a/plugins/modules/security_group_rule.py b/plugins/modules/security_group_rule.py index 97b6f973..a599b5c6 100644 --- a/plugins/modules/security_group_rule.py +++ b/plugins/modules/security_group_rule.py @@ -308,7 +308,8 @@ class SecurityGroupRuleModule(OpenStackModule): def _define_prototype(self): filters = {} prototype = dict((k, self.params[k]) - for k in ['direction', 'remote_ip_prefix'] + for k in ['description', 'direction', + 'remote_ip_prefix'] if self.params[k] is not None) # When remote_ip_prefix is missing a netmask, then Neutron will add