Merge "Some smaller fixes for openSUSE 13.1 support"

2014-04-24 22:04:30 +00:00 · 2014-04-24 22:04:30 +00:00 · f63ee0e38d
commit f63ee0e38d
parent 79698041d0 65aaa183f4
3 changed files with 6 additions and 2 deletions
--- a/files/rpms-suse/neutron
+++ b/files/rpms-suse/neutron
@ -1,5 +1,5 @@
 dnsmasq
-dnsmasq-utils # dist:opensuse-12.3
+dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
 ebtables
 iptables
 iputils
--- a/files/rpms-suse/nova
+++ b/files/rpms-suse/nova
@ -1,6 +1,6 @@
 curl
 dnsmasq
-dnsmasq-utils # dist:opensuse-12.3
+dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
 ebtables
 gawk
 genisoimage # required for config_drive
--- a/lib/nova
+++ b/lib/nova
@ -303,6 +303,10 @@ function configure_nova {
                sudo chown -R $STACK_USER $NOVA_INSTANCES_PATH
            fi
        fi
+        if is_suse; then
+            # iscsid is not started by default
+            start_service iscsid
+        fi
    fi

    # Rebuild the config file from scratch