1. devstack
  2. Commit 9278eb78dfc47e3b48e2b72faf90efc6bb44e18f
Browse code

Move setting lvm libvirt configs to hypervisor-libvirt

When the nova backend is LVM we set some libvirt configs
in nova.conf. Those should happen in the libvirt plugin
file rather than the generic nova file since it's specific
to running nova-compute with libvirt.

Change-Id: I37a63a5fba2e9eea4daafe4ec390b2e7aac236f3

Matt Riedemann authored on 2016/05/19 02:38:38
Showing 2 changed files
lib/nova
History View file @ 9278eb7
... ... 
@@ -589,14 +589,6 @@ function create_nova_conf {
589 589
590 590 
     iniset $NOVA_CONF cinder os_region_name "$REGION_NAME"
591 591
592 
-    if [[ "$NOVA_BACKEND" == "LVM" ]]; then
593 
-        iniset $NOVA_CONF libvirt images_type "lvm"
594 
-        iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME
595 
-        if isset LVM_VOLUME_CLEAR; then
596 
-            iniset $NOVA_CONF libvirt volume_clear "$LVM_VOLUME_CLEAR"
597 
-        fi
598 
-    fi
599 
-
600 592 
     if is_ssl_enabled_service glance || is_service_enabled tls-proxy; then
601 593 
         iniset $NOVA_CONF DEFAULT glance_protocol https
602 594 
     fi
lib/nova_plugins/hypervisor-libvirt
History View file @ 9278eb7
... ... 
@@ -68,6 +68,12 @@ function configure_nova_hypervisor {
68 68 
         iniset $NOVA_CONF vnc vncserver_proxyclient_address  $HOST_IP
69 69 
         iniset $NOVA_CONF vnc vncserver_listen $HOST_IP
70 70 
         iniset $NOVA_CONF vnc keymap
71 
+    elif [[ "$NOVA_BACKEND" == "LVM" ]]; then
72 
+        iniset $NOVA_CONF libvirt images_type "lvm"
73 
+        iniset $NOVA_CONF libvirt images_volume_group $DEFAULT_VOLUME_GROUP_NAME
74 
+        if isset LVM_VOLUME_CLEAR; then
75 
+            iniset $NOVA_CONF libvirt volume_clear "$LVM_VOLUME_CLEAR"
76 
+        fi
71 77 
     fi
72 78 
 }
73 79