Browse code

Merge "Fix openvswitch package and service names for openSUSE"

Jenkins authored on 2014/04/11 09:11:50
Showing 3 changed files
... ...
@@ -1,4 +1,3 @@
1 1
 openvswitch # NOPRIME
2
-openvswitch-controller # NOPRIME
3 2
 openvswitch-switch # NOPRIME
4 3
 
... ...
@@ -44,9 +44,8 @@ function _neutron_ovs_base_install_agent_packages {
44 44
         # Ensure that the service is started
45 45
         restart_service openvswitch
46 46
     elif is_suse; then
47
-        install_package openvswitch
47
+        install_package openvswitch-switch
48 48
         restart_service openvswitch-switch
49
-        restart_service openvswitch-controller
50 49
     fi
51 50
 }
52 51
 
... ...
@@ -132,9 +132,8 @@ function install_opendaylight-compute {
132 132
         # Ensure that the service is started
133 133
         restart_service openvswitch
134 134
     elif is_suse; then
135
-        install_package openvswitch
135
+        install_package openvswitch-switch
136 136
         restart_service openvswitch-switch
137
-        restart_service openvswitch-controller
138 137
     fi
139 138
 }
140 139