diff --git a/README.md b/README.md index 7eacebdc1e..40060a7cf5 100644 --- a/README.md +++ b/README.md @@ -215,21 +215,6 @@ in the near future. The ``local.conf`` headers for the replacements are: [[post-config|/$Q_PLUGIN_CONF_FILE]] [linuxbridge] # or [ovs] -* ``Q_AGENT_EXTRA_AGENT_OPTS``: - - [[post-config|/$Q_PLUGIN_CONF_FILE]] - [agent] - -* ``Q_AGENT_EXTRA_SRV_OPTS``: - - [[post-config|/$Q_PLUGIN_CONF_FILE]] - [linuxbridge] # or [ovs] - -* ``Q_SRV_EXTRA_DEFAULT_OPTS``: - - [[post-config|$NEUTRON_CONF]] - [DEFAULT] - Example extra config in `local.conf`: [[post-config|/$Q_PLUGIN_CONF_FILE]] diff --git a/lib/cinder b/lib/cinder index 17a0cc3c1a..0d157dd78e 100644 --- a/lib/cinder +++ b/lib/cinder @@ -65,21 +65,14 @@ else fi -# Maintain this here for backward-compatibility with the old configuration -# DEPRECATED: Use CINDER_ENABLED_BACKENDS instead -# Support for multi lvm backend configuration (default is no support) -CINDER_MULTI_LVM_BACKEND=$(trueorfalse False CINDER_MULTI_LVM_BACKEND) - # Default backends # The backend format is type:name where type is one of the supported backend # types (lvm, nfs, etc) and name is the identifier used in the Cinder # configuration and for the volume type name. Multiple backends are # comma-separated. -if [[ $CINDER_MULTI_LVM_BACKEND == "False" ]]; then - CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-lvm:${DEFAULT_VOLUME_GROUP_NAME##*-}} -else - CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-lvm:${DEFAULT_VOLUME_GROUP_NAME##*-},lvm:cinder} -fi +# The old ``CINDER_MULTI_LVM_BACKEND=True`` setting had a default of: +# CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-lvm:lvmdriver-1,lvm:lvmdriver-2} +CINDER_ENABLED_BACKENDS=${CINDER_ENABLED_BACKENDS:-lvm:lvmdriver-1} # Should cinder perform secure deletion of volumes? diff --git a/lib/neutron_plugins/linuxbridge_agent b/lib/neutron_plugins/linuxbridge_agent index ec17c01612..c9ea1cac28 100644 --- a/lib/neutron_plugins/linuxbridge_agent +++ b/lib/neutron_plugins/linuxbridge_agent @@ -50,20 +50,6 @@ function neutron_plugin_configure_plugin_agent { fi AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-linuxbridge-agent" iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES - # Define extra "AGENT" configuration options when q-agt is configured by defining - # the array ``Q_AGENT_EXTRA_AGENT_OPTS``. - # For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)`` - for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do - # Replace the first '=' with ' ' for iniset syntax - iniset /$Q_PLUGIN_CONF_FILE agent ${I/=/ } - done - # Define extra "LINUX_BRIDGE" configuration options when q-agt is configured by defining - # the array ``Q_AGENT_EXTRA_SRV_OPTS``. - # For Example: ``Q_AGENT_EXTRA_SRV_OPTS=(foo=true bar=2)`` - for I in "${Q_AGENT_EXTRA_SRV_OPTS[@]}"; do - # Replace the first '=' with ' ' for iniset syntax - iniset /$Q_PLUGIN_CONF_FILE linux_bridge ${I/=/ } - done } function neutron_plugin_setup_interface_driver { diff --git a/lib/neutron_plugins/ofagent_agent b/lib/neutron_plugins/ofagent_agent index 915badc7a0..d38fbebc74 100644 --- a/lib/neutron_plugins/ofagent_agent +++ b/lib/neutron_plugins/ofagent_agent @@ -84,13 +84,6 @@ function neutron_plugin_configure_plugin_agent { AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-ofagent-agent" iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES - # Define extra "AGENT" configuration options when q-agt is configured by defining - # defining the array ``Q_AGENT_EXTRA_AGENT_OPTS``. - # For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)`` - for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do - # Replace the first '=' with ' ' for iniset syntax - iniset /$Q_PLUGIN_CONF_FILE agent ${I/=/ } - done } function neutron_plugin_setup_interface_driver { diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent index 2ab61b0c3e..1d24f3b837 100644 --- a/lib/neutron_plugins/openvswitch_agent +++ b/lib/neutron_plugins/openvswitch_agent @@ -104,20 +104,6 @@ function neutron_plugin_configure_plugin_agent { iniset "/$Q_PLUGIN_CONF_FILE.domU" agent root_helper "$Q_RR_COMMAND" fi iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES - # Define extra "AGENT" configuration options when q-agt is configured by defining - # defining the array ``Q_AGENT_EXTRA_AGENT_OPTS``. - # For Example: ``Q_AGENT_EXTRA_AGENT_OPTS=(foo=true bar=2)`` - for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do - # Replace the first '=' with ' ' for iniset syntax - iniset /$Q_PLUGIN_CONF_FILE agent ${I/=/ } - done - # Define extra "OVS" configuration options when q-agt is configured by defining - # defining the array ``Q_AGENT_EXTRA_SRV_OPTS``. - # For Example: ``Q_AGENT_EXTRA_SRV_OPTS=(foo=true bar=2)`` - for I in "${Q_AGENT_EXTRA_SRV_OPTS[@]}"; do - # Replace the first '=' with ' ' for iniset syntax - iniset /$Q_PLUGIN_CONF_FILE ovs ${I/=/ } - done } function neutron_plugin_setup_interface_driver { diff --git a/lib/tempest b/lib/tempest index 5ca217e893..d990b4fd2b 100644 --- a/lib/tempest +++ b/lib/tempest @@ -29,7 +29,6 @@ # - ``USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION`` # - ``DEFAULT_INSTANCE_TYPE`` # - ``DEFAULT_INSTANCE_USER`` -# - ``CINDER_MULTI_LVM_BACKEND`` # - ``CINDER_ENABLED_BACKENDS`` # # ``stack.sh`` calls the entry points in this order: diff --git a/stack.sh b/stack.sh index 3f97919e0e..19584b9759 100755 --- a/stack.sh +++ b/stack.sh @@ -1329,57 +1329,6 @@ if [[ -n "$DEPRECATED_TEXT" ]]; then echo_summary "WARNING: $DEPRECATED_TEXT" fi -if is_service_enabled neutron; then - # TODO(dtroyer): Remove Q_AGENT_EXTRA_AGENT_OPTS after stable/juno branch is cut - if [[ -n "$Q_AGENT_EXTRA_AGENT_OPTS" ]]; then - echo "" - echo_summary "WARNING: Q_AGENT_EXTRA_AGENT_OPTS is used" - echo "You are using Q_AGENT_EXTRA_AGENT_OPTS to pass configuration into $NEUTRON_CONF." - echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:" - echo "Q_AGENT_EXTRA_AGENT_OPTS will be removed early in the 'K' development cycle" - echo " -[[post-config|/\$Q_PLUGIN_CONF_FILE]] -[DEFAULT] -" - for I in "${Q_AGENT_EXTRA_AGENT_OPTS[@]}"; do - # Replace the first '=' with ' ' for iniset syntax - echo ${I} - done - fi - - # TODO(dtroyer): Remove Q_AGENT_EXTRA_SRV_OPTS after stable/juno branch is cut - if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then - echo "" - echo_summary "WARNING: Q_AGENT_EXTRA_SRV_OPTS is used" - echo "You are using Q_AGENT_EXTRA_SRV_OPTS to pass configuration into $NEUTRON_CONF." - echo "Please convert that configuration in localrc to a $NEUTRON_CONF section in local.conf:" - echo "Q_AGENT_EXTRA_AGENT_OPTS will be removed early in the 'K' development cycle" - echo " -[[post-config|/\$Q_PLUGIN_CONF_FILE]] -[DEFAULT] -" - for I in "${Q_AGENT_EXTRA_SRV_OPTS[@]}"; do - # Replace the first '=' with ' ' for iniset syntax - echo ${I} - done - fi -fi - -if is_service_enabled cinder; then - # TODO(dtroyer): Remove CINDER_MULTI_LVM_BACKEND after stable/juno branch is cut - if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then - echo "" - echo_summary "WARNING: CINDER_MULTI_LVM_BACKEND is used" - echo "You are using CINDER_MULTI_LVM_BACKEND to configure Cinder's multiple LVM backends" - echo "Please convert that configuration in local.conf to use CINDER_ENABLED_BACKENDS." - echo "CINDER_MULTI_LVM_BACKEND will be removed early in the 'K' development cycle" - echo " -[[local|localrc]] -CINDER_ENABLED_BACKENDS=lvm:lvmdriver-1,lvm:lvmdriver-2 -" - fi -fi - # Indicate how long this took to run (bash maintained variable ``SECONDS``) echo_summary "stack.sh completed in $SECONDS seconds."