Merge "scope warnings to only display if the services are enabled"

stack.sh

@@ -1423,6 +1423,7 @@ 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 ""
@@ -1456,7 +1457,9 @@ if [[ -n "$Q_AGENT_EXTRA_SRV_OPTS" ]]; then
             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 ""
@@ -1469,6 +1472,7 @@ if [[ "$CINDER_MULTI_LVM_BACKEND" = "True" ]]; then
 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."