diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2018-05-08 08:57:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-08 08:57:44 +0000 |
| commit | 5c7b8938e79843b1c9a7883aa5c95a81634ecc9d (patch) | |
| tree | e5e981dd3d65a9c0aec71fee59ed26c3f4e428f5 /yardstick | |
| parent | 245e2e7c3fe831027944709c7712e8552ef2e2fc (diff) | |
| parent | d00660e583ef89fe07149c7f0cffcced7cd72133 (diff) | |
Merge "Bug Fix: Start openvswitch service in Centos distro"
Diffstat (limited to 'yardstick')
| -rwxr-xr-x | yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash b/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash index 1d0fffd06..2388507d7 100755 --- a/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/start_service.bash @@ -16,11 +16,9 @@ set -e service_name=$1 operation=${2-start} # values are "start" or "restart" -Distributor=$(lsb_release -a | grep "Distributor ID" | awk '{print $3}') - -if [ "$Distributor" != "Ubuntu" -a "$service_name" != "keystone" -a "$service_name" != "neutron-server" -a "$service_name" != "haproxy" ]; then +if [ -f /usr/bin/yum -a "$service_name" != "keystone" -a "$service_name" != "neutron-server" -a "$service_name" != "haproxy" -a "$service_name" != "openvswitch" ]; then service_name="openstack-"${service_name} -elif [ "$Distributor" = "Ubuntu" -a "$service_name" = "keystone" ]; then +elif [ -f /usr/bin/apt -a "$service_name" = "keystone" ]; then service_name="apache2" elif [ "$service_name" = "keystone" ]; then service_name="httpd" |