Remove security_groups_provider_updated rpc code
In Pike, the agent side of security_groups_provider_updated() RPC code was changed to a NOOP when the provider rules were changed to be static, https://review.openstack.org/#/c/432506 Now that we're in Queens we can deprecate it. Change-Id: Ie018ff653633d3524f0e80c5e172a5d01bdad437
This commit is contained in:
@@ -158,25 +158,6 @@ class SecurityGroupAgentRpcApiMixin(object):
|
||||
cctxt.cast(context, 'security_groups_member_updated',
|
||||
security_groups=security_groups)
|
||||
|
||||
def security_groups_provider_updated(self, context,
|
||||
devices_to_update=None):
|
||||
"""Notify provider updated security groups."""
|
||||
# TODO(kevinbenton): remove in Queens
|
||||
# NOTE(ihrachys) the version here should really be 1.3, but since we
|
||||
# don't support proper version pinning yet, we leave it intact to allow
|
||||
# to work with older agents. The reason why we should not require the
|
||||
# version here is that in rolling upgrade scenarios we always upgrade
|
||||
# server first, and since the notification is directed from the newer
|
||||
# server to older agents, and those agents don't have their RPC entry
|
||||
# point bumped to 1.3 yet, we cannot safely enforce the minimal
|
||||
# version. Newer payload works for older agents because agent handlers
|
||||
# are written so that we silently ignore unknown parameters.
|
||||
cctxt = self.client.prepare(version=self.SG_RPC_VERSION,
|
||||
topic=self._get_security_group_topic(),
|
||||
fanout=True)
|
||||
cctxt.cast(context, 'security_groups_provider_updated',
|
||||
devices_to_update=devices_to_update)
|
||||
|
||||
|
||||
class SecurityGroupAgentRpcCallbackMixin(object):
|
||||
"""A mix-in that enable SecurityGroup support in agent implementations.
|
||||
@@ -219,14 +200,6 @@ class SecurityGroupAgentRpcCallbackMixin(object):
|
||||
return self._security_groups_agent_not_set()
|
||||
self.sg_agent.security_groups_member_updated(security_groups)
|
||||
|
||||
def security_groups_provider_updated(self, context, **kwargs):
|
||||
"""Callback for security group provider update.
|
||||
|
||||
This is now a NOOP since provider rules are static. The server just
|
||||
generates the notification for agents running older versions that have
|
||||
IP-specific rules.
|
||||
"""
|
||||
|
||||
|
||||
class SecurityGroupServerAPIShim(sg_rpc_base.SecurityGroupInfoAPIMixin):
|
||||
"""Agent-side replacement for SecurityGroupServerRpcApi using local data.
|
||||
|
||||
Reference in New Issue
Block a user