NEUTRON_AUTH="--os-username neutron --os-password neutron --os-tenant-name neutron --os-auth-url http://127.0.0.1:35357/v2.0"
CORE_PLUGIN="neutron.plugins.ml2.plugin.Ml2Plugin"
-if [[ $PLATFORM =~ Ubuntu ]]; then UBUNTU=true; fi
+if [[ $PLATFORM =~ Ubuntu ]]
+then
+ UBUNTU=true
+else
+ setenforce 0
+fi
+
if [ -z $PACKAGE ]; then echo "Package for testing is not specified"; exit 1; fi
echo "127.0.10.1 $(hostname)" >> /etc/hosts
# Workaround for bug #1371184
if ! $UBUNTU
then
- chown root:neutron /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+ chown root:neutron /etc/neutron/plugins/ml2/openvswitch_agent.ini
fi
if ! $SERVICE_STARTED ; then
if $UBUNTU; then
restart_service openvswitch-switch
- restart_service neutron-plugin-openvswitch-agent
+ restart_service neutron-openvswitch-agent
else
restart_service openvswitch
restart_service neutron-openvswitch-agent
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Open vSwitch agent" | awk -F "|" '{print $5}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Open vSwitch agent" | awk -F "|" '{print $6}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "OVS agent check failed"; FAILURE=true; fi
}
fi
#This sleep here and in other functions is intended to let the agent add information to the queue
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "L3 agent" | awk -F "|" '{print $5}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "L3 agent" | awk -F "|" '{print $6}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "L3 agent check failed"; FAILURE=true; fi
}
SERVICE_STARTED=true
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "DHCP agent" | awk -F "|" '{print $5}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "DHCP agent" | awk -F "|" '{print $6}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "DHCP agent check failed"; FAILURE=true; fi
}
SERVICE_STARTED=true
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metadata agent" | awk -F "|" '{print $5}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metadata agent" | awk -F "|" '{print $6}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "Metadata agent check failed"; FAILURE=true; fi
}
SERVICE_STARTED=true
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metering agent" | awk -F "|" '{print $5}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metering agent" | awk -F "|" '{print $6}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "Metering agent check failed"; FAILURE=true; fi
}
try check_neutron_server
check_error
;;
- openstack-neutron-openvswitch|neutron-plugin-openvswitch-agent)
+ openstack-neutron-openvswitch|neutron-openvswitch-agent)
install_packages
install_neutron_server
setup_database
try check_neutron_metadata_agent
check_error
;;
- openstack-neutron-metering-agent|neutron-plugin-metering-agent)
+ openstack-neutron-metering-agent|neutron-metering-agent)
install_neutron_server
install_packages
setup_database