Browse Source

Deprecate OVSvApp monitoring configuration options

The OVSvApp monitoring feature is deprecated and will be removed
in the next release. So as part of this effort we are deprecating
the configuraton options for enabling/disabling the monitoring
feature.
ENABLE_OVSVAPP_MONITOR and
monitoring_ip
Here is the rationale for the deprecation.[1]

[1] https://review.openstack.org/#/c/241234

Change-Id: I5abef29d178fb29bbf5f22975255061fccc4c270
Swaminathan Vasudevan 1 year ago
parent
commit
a877232fc5

+ 2
- 0
devstack/README.rst View File

@@ -103,6 +103,8 @@
103 103
      disable_service q-agt
104 104
 
105 105
      # Provide to enable Fault Tolerance for OVSvApp.
106
+     # DEPRECATED: This config option is deprecated and  will be removed in
107
+     # the next release.
106 108
      ENABLE_OVSVAPP_MONITOR=
107 109
      # Set this flag in ml2_conf.ini on neutron-server
108 110
      # For Example:

+ 2
- 0
devstack/settings View File

@@ -101,6 +101,8 @@ TUNNEL_BRIDGE=${TUNNEL_BRIDGE:-br-tun}
101 101
 SECURITY_BRIDGE=${SECURITY_BRIDGE:-br-sec}
102 102
 
103 103
 # Provide to enable Fault Tolerance for OVSvApp.
104
+# DEPRECATED: This config option is deprecated and will be removed
105
+# in the next release
104 106
 ENABLE_OVSVAPP_MONITOR=${ENABLE_OVSVAPP_MONITOR:-False}
105 107
 
106 108
 # The name of the VMware vSphere cluster.

+ 2
- 0
networking_vsphere/agent/ovsvapp_agent.py View File

@@ -89,6 +89,8 @@ class OVSvAppAgent(agent.Agent, ovs_agent.OVSNeutronAgent):
89 89
         self.conf = cfg.CONF
90 90
         self.esx_hostname = CONF.VMWARE.esx_hostname
91 91
         self.vcenter_id = CONF.VMWARE.vcenter_id
92
+        # DEPRECATED: This config option is deprecated and will be
93
+        # removed in the next release
92 94
         self.monitoring_ip = CONF.OVSVAPP.monitoring_ip
93 95
         self.esx_maintenance_mode = CONF.VMWARE.esx_maintenance_mode
94 96
         if not self.vcenter_id:

+ 4
- 3
networking_vsphere/common/config.py View File

@@ -111,9 +111,10 @@ OVSVAPP_OPTS = [
111 111
     cfg.StrOpt('local_ip',
112 112
                default='',
113 113
                help='Local IP address of VXLAN tunnel endpoint.'),
114
-    cfg.StrOpt('monitoring_ip',
115
-               default='',
116
-               help='IP address for monitoring OVS Status.')
114
+    cfg.StrOpt('monitoring_ip', default='',
115
+               deprecated_for_removal=True,
116
+               help='IP address for monitoring OVS Status. Deprecated, to be'
117
+                    'removed in the next release.')
117 118
 ]
118 119
 
119 120
 # OVSvApp Security Group related config read from ovsvapp_agent.ini.

+ 7
- 1
networking_vsphere/monitor/ovsvapp_monitor.py View File

@@ -37,14 +37,20 @@ LOG = log.getLogger(__name__)
37 37
 DEFAULT_MONITOR_INTERVAL = 10
38 38
 
39 39
 # OVSvApp Fault Management config read from neutron.conf.
40
+# DEPRECATED: This option is deprecated and will be removed in the
41
+# next release
40 42
 OVSVAPP_MONITOR_OPTS = [
41 43
     cfg.BoolOpt('enable_ovsvapp_monitor', default=False,
42
-                help=_('To monitor the OVSvApp Agents.'))
44
+                deprecated_for_removal=True,
45
+                help=_('To monitor the OVSvApp Agents. Deprecated, to be'
46
+                       'removed in the next release'))
43 47
 ]
44 48
 
45 49
 cfg.CONF.register_opts(OVSVAPP_MONITOR_OPTS, "OVSVAPP")
46 50
 
47 51
 
52
+# DEPRECATED: AgentMonitor is deprecated and will be removed in the next
53
+# release.
48 54
 class AgentMonitor(agents_db.AgentDbMixin, common_db_mixin.CommonDbMixin):
49 55
     """OVSvApp agent monitor class.
50 56
 

Loading…
Cancel
Save