From 3f34d9af711af1b0f5cc77180ae2791a532fb291 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@suse.com>
Date: Tue, 12 Mar 2013 17:57:36 +0100
Subject: [PATCH] Make openSUSE port up-to-date

Several changes didn't properly deal with openSUSE, so fix this.

Change-Id: Icc9c894031a8a693d9c41e2ec5717bd76f618342
---
 files/rpms-suse/ldap                   | 3 +++
 files/rpms-suse/n-spice                | 1 +
 files/rpms-suse/nova                   | 2 ++
 files/rpms-suse/ryu                    | 1 +
 lib/ldap                               | 4 +---
 lib/quantum_plugins/agent_loadbalancer | 3 +++
 lib/quantum_plugins/ovs_base           | 4 ++--
 7 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 files/rpms-suse/ldap
 create mode 100644 files/rpms-suse/n-spice

diff --git a/files/rpms-suse/ldap b/files/rpms-suse/ldap
new file mode 100644
index 0000000000..46d26f0796
--- /dev/null
+++ b/files/rpms-suse/ldap
@@ -0,0 +1,3 @@
+openldap2
+openldap2-client
+python-ldap
diff --git a/files/rpms-suse/n-spice b/files/rpms-suse/n-spice
new file mode 100644
index 0000000000..c8722b9f66
--- /dev/null
+++ b/files/rpms-suse/n-spice
@@ -0,0 +1 @@
+python-numpy
diff --git a/files/rpms-suse/nova b/files/rpms-suse/nova
index 03067162c9..04af7f3110 100644
--- a/files/rpms-suse/nova
+++ b/files/rpms-suse/nova
@@ -3,6 +3,7 @@ curl
 dnsmasq
 ebtables
 gawk
+genisoimage # required for config_drive
 iptables
 iputils
 kpartx
@@ -34,6 +35,7 @@ python-lxml # needed for glance which is needed for nova --- this shouldn't be h
 python-mox
 python-mysql
 python-netaddr
+python-numpy # needed by websockify for spice console
 python-paramiko
 python-python-gflags
 python-sqlalchemy-migrate
diff --git a/files/rpms-suse/ryu b/files/rpms-suse/ryu
index 763fd24cdd..90b43a47d9 100644
--- a/files/rpms-suse/ryu
+++ b/files/rpms-suse/ryu
@@ -2,4 +2,5 @@ python-distribute
 python-setuptools # instead of python-distribute; dist:sle11sp2
 python-Sphinx
 python-gevent
+python-netifaces
 python-python-gflags
diff --git a/lib/ldap b/lib/ldap
index 5cb4534765..0a0d197df2 100644
--- a/lib/ldap
+++ b/lib/ldap
@@ -16,13 +16,11 @@ function install_ldap() {
     echo "os_VENDOR is $os_VENDOR"
     printf "installing"
     if is_ubuntu; then
-        echo "os vendor is Ubuntu"
         LDAP_OLCDB_NUMBER=1
         LDAP_ROOTPW_COMMAND=replace
         sudo DEBIAN_FRONTEND=noninteractive apt-get install slapd ldap-utils
         #automatically starts LDAP on ubuntu so no need to call start_ldap
-    elif is_fedora; then
-        echo "os vendor is Fedora"
+    elif is_fedora || is_suse; then
         LDAP_OLCDB_NUMBER=2
         LDAP_ROOTPW_COMMAND=add
         start_ldap
diff --git a/lib/quantum_plugins/agent_loadbalancer b/lib/quantum_plugins/agent_loadbalancer
index a4d6dff024..87e7aaaf36 100644
--- a/lib/quantum_plugins/agent_loadbalancer
+++ b/lib/quantum_plugins/agent_loadbalancer
@@ -11,6 +11,9 @@ AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"
 function quantum_agent_lbaas_install_agent_packages() {
     if is_ubuntu || is_fedora; then
         install_package haproxy
+    elif is_suse; then
+        ### FIXME: Find out if package can be pushed to Factory
+        echo "HAProxy packages can be installed from server:http project in OBS"
     fi
 }
 
diff --git a/lib/quantum_plugins/ovs_base b/lib/quantum_plugins/ovs_base
index 915129e10e..ab988d9f62 100644
--- a/lib/quantum_plugins/ovs_base
+++ b/lib/quantum_plugins/ovs_base
@@ -29,8 +29,8 @@ function _quantum_ovs_base_install_agent_packages() {
         # Ensure that the service is started
         restart_service openvswitch
     elif is_suse; then
-        ### FIXME: Find RPMs for OpenVSwitch
-        echo "OpenVSwitch packages need to be located"
+        ### FIXME: Find out if package can be pushed to Factory
+        echo "OpenVSwitch packages can be installed from Cloud:OpenStack:Master in OBS"
         restart_service openvswitch
     fi
 }