Browse code

Move hypervisor-specific code into a case statement

Change-Id: Id799506f180ac81d493f49de140cc079338430aa

Bob Ball authored on 2013/05/16 22:27:01
Showing 1 changed files
... ...
@@ -164,14 +164,25 @@ PBR_BRANCH=${PBR_BRANCH:-master}
164 164
 
165 165
 # Nova hypervisor configuration.  We default to libvirt with **kvm** but will
166 166
 # drop back to **qemu** if we are unable to load the kvm module.  ``stack.sh`` can
167
-# also install an **LXC** or **OpenVZ** based system.
167
+# also install an **LXC**, **OpenVZ** or **XenAPI** based system.
168 168
 VIRT_DRIVER=${VIRT_DRIVER:-libvirt}
169
-LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
170
-if [[ "$os_VENDOR" =~ (Debian) ]]; then
171
-  LIBVIRT_GROUP=libvirt
172
-else
173
-  LIBVIRT_GROUP=libvirtd
174
-fi
169
+case "$VIRT_DRIVER" in
170
+    libvirt)
171
+        LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
172
+        if [[ "$os_VENDOR" =~ (Debian) ]]; then
173
+            LIBVIRT_GROUP=libvirt
174
+        else
175
+            LIBVIRT_GROUP=libvirtd
176
+        fi
177
+        ;;
178
+    xenserver)
179
+        # Xen config common to nova and quantum
180
+        XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
181
+        XENAPI_USER=${XENAPI_USER:-"root"}
182
+        ;;
183
+    *)
184
+        ;;
185
+esac
175 186
 
176 187
 # Specify a comma-separated list of UEC images to download and install into glance.
177 188
 # supported urls here are:
... ...
@@ -234,10 +245,6 @@ PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"public"}
234 234
 # Compatibility until it's eradicated from CI
235 235
 USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
236 236
 
237
-# Xen config common to nova and quantum
238
-XENAPI_CONNECTION_URL=${XENAPI_CONNECTION_URL:-"http://169.254.0.1"}
239
-XENAPI_USER=${XENAPI_USER:-"root"}
240
-
241 237
 # Local variables:
242 238
 # mode: shell-script
243 239
 # End: