Merge pull request #2022 from jsuchome/evacuate-lb-5.0

[5.0] upgrade: Fixes for neutron-evacuate-lbaasv2-agent execution (SOC-11171)

Author: Jiří Suchomel

chef/cookbooks/crowbar/recipes/prepare-upgrade-scripts.rb

@@ -231,9 +231,6 @@
   owner "root"
   group "root"
   action :create
-  variables(
-    use_ha: use_ha
-  )
   only_if { roles.include? "neutron-network" }
 end
 

chef/cookbooks/crowbar/templates/default/crowbar-lbaas-evacuation.sh.erb

@@ -31,11 +31,10 @@ rm -f $UPGRADEDIR/crowbar-lbaas-evacuation-failed
 
 if systemctl --quiet is-active  openstack-neutron-lbaasv2-agent.service; then
     log "Evacuating neutron-lbaasv2-agent on $hostname"
-    use_crm=<%= @use_ha ? "--use_crm" : "" %>
-    /usr/bin/neutron-evacuate-lbaasv2-agent $use_crm $delete_ns \
+    /usr/bin/neutron-evacuate-lbaasv2-agent $delete_ns \
         --host $hostname \
         --config-file /etc/neutron/lbaas-connection.conf \
-        --config-file /etc/neutron/neutron.conf
+        --config-dir /etc/neutron/neutron.conf.d
 
     ret=$?
     if [ $ret != 0 ] ; then