1. devstack
  2. Commit 2307f9de752244104ba049cef380916c87918060
Browse code

Avoid using deprecated Q_AGENT_EXTRA_AGENT_OPTS in ML2 setup

Q_AGENT_EXTRA_AGENT_OPTS is deprecated now and stack.sh displays
the warning that it will be removed early in "K" cycle.
Neutron ML2 devstack uses Q_AGENT_EXTRA_AGENT_OPTS to pass tunnel
configurations to Neutron plugin agents.

This commit removes the usage of Q_AGENT_EXTRA_AGENT_OPTS and
configures these config options directly.

Change-Id: I7fc1613ff78c0a8b1e80cc041b06f5d4680c34f2
Closes-Bug: #1354670

Akihiro Motoki authored on 2014/08/09 18:58:20
Showing 4 changed files
lib/neutron_plugins/linuxbridge_agent
History View file @ 2307f9d
... ... 
@@ -47,6 +47,7 @@ function neutron_plugin_configure_plugin_agent {
47 47 
         iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
48 48 
     fi
49 49 
     AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-linuxbridge-agent"
50 
+    iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES
50 51 
     # Define extra "AGENT" configuration options when q-agt is configured by defining
51 52 
     # the array ``Q_AGENT_EXTRA_AGENT_OPTS``.
52 53 
     # For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)``
lib/neutron_plugins/ml2
History View file @ 2307f9d
... ... 
@@ -6,13 +6,13 @@ ML2_XTRACE=$(set +o | grep xtrace)
6 6 
 set +o xtrace
7 7
8 8 
 # Enable this to simply and quickly enable tunneling with ML2.
9 
-# Select either 'gre', 'vxlan', or '(gre vxlan)'
9 
+# Select either 'gre', 'vxlan', or 'gre,vxlan'
10 10 
 Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-"vxlan"}
11 11 
 # This has to be set here since the agent will set this in the config file
12 12 
 if [[ "$Q_ML2_TENANT_NETWORK_TYPE" == "gre" || "$Q_ML2_TENANT_NETWORK_TYPE" == "vxlan" ]]; then
13 
-    Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE)
13 
+    Q_TUNNEL_TYPES=$Q_ML2_TENANT_NETWORK_TYPE
14 14 
 elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
15 
-    Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=gre)
15 
+    Q_TUNNEL_TYPES=gre
16 16 
 fi
17 17
18 18 
 # Default openvswitch L2 agent
lib/neutron_plugins/ofagent_agent
History View file @ 2307f9d
... ... 
@@ -71,6 +71,7 @@ function neutron_plugin_configure_plugin_agent {
71 71 
     fi
72 72 
     AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-ofagent-agent"
73 73
74 
+    iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES
74 75 
     # Define extra "AGENT" configuration options when q-agt is configured by defining
75 76 
     # defining the array ``Q_AGENT_EXTRA_AGENT_OPTS``.
76 77 
     # For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)``
lib/neutron_plugins/openvswitch_agent
History View file @ 2307f9d
... ... 
@@ -102,6 +102,7 @@ function neutron_plugin_configure_plugin_agent {
102 102 
         # Set root wrap
103 103 
         iniset "/$Q_PLUGIN_CONF_FILE.domU" agent root_helper "$Q_RR_COMMAND"
104 104 
     fi
105 
+    iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES
105 106 
     # Define extra "AGENT" configuration options when q-agt is configured by defining
106 107 
     # defining the array ``Q_AGENT_EXTRA_AGENT_OPTS``.
107 108 
     # For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)``