Browse code

Merge "Add integration bridge to the nova.conf"

Jenkins authored on 2013/07/15 23:03:48
Showing 1 changed files
... ...
@@ -1081,7 +1081,9 @@ if is_service_enabled nova; then
1081 1081
         iniset $NOVA_CONF DEFAULT vmwareapi_host_username "$VMWAREAPI_USER"
1082 1082
         iniset $NOVA_CONF DEFAULT vmwareapi_host_password "$VMWAREAPI_PASSWORD"
1083 1083
         iniset $NOVA_CONF DEFAULT vmwareapi_cluster_name "$VMWAREAPI_CLUSTER"
1084
-
1084
+        if is_service_enabled neutron; then
1085
+            iniset $NOVA_CONF vmware integration_bridge $OVS_BRIDGE
1086
+        fi
1085 1087
 
1086 1088
     # fake
1087 1089
     # ----