Several changes didn't properly deal with openSUSE, so fix this.
Change-Id: Icc9c894031a8a693d9c41e2ec5717bd76f618342
... | ... |
@@ -3,6 +3,7 @@ curl |
3 | 3 |
dnsmasq |
4 | 4 |
ebtables |
5 | 5 |
gawk |
6 |
+genisoimage # required for config_drive |
|
6 | 7 |
iptables |
7 | 8 |
iputils |
8 | 9 |
kpartx |
... | ... |
@@ -34,6 +35,7 @@ python-lxml # needed for glance which is needed for nova --- this shouldn't be h |
34 | 34 |
python-mox |
35 | 35 |
python-mysql |
36 | 36 |
python-netaddr |
37 |
+python-numpy # needed by websockify for spice console |
|
37 | 38 |
python-paramiko |
38 | 39 |
python-python-gflags |
39 | 40 |
python-sqlalchemy-migrate |
... | ... |
@@ -16,13 +16,11 @@ function install_ldap() { |
16 | 16 |
echo "os_VENDOR is $os_VENDOR" |
17 | 17 |
printf "installing" |
18 | 18 |
if is_ubuntu; then |
19 |
- echo "os vendor is Ubuntu" |
|
20 | 19 |
LDAP_OLCDB_NUMBER=1 |
21 | 20 |
LDAP_ROOTPW_COMMAND=replace |
22 | 21 |
sudo DEBIAN_FRONTEND=noninteractive apt-get install slapd ldap-utils |
23 | 22 |
#automatically starts LDAP on ubuntu so no need to call start_ldap |
24 |
- elif is_fedora; then |
|
25 |
- echo "os vendor is Fedora" |
|
23 |
+ elif is_fedora || is_suse; then |
|
26 | 24 |
LDAP_OLCDB_NUMBER=2 |
27 | 25 |
LDAP_ROOTPW_COMMAND=add |
28 | 26 |
start_ldap |
... | ... |
@@ -11,6 +11,9 @@ AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent" |
11 | 11 |
function quantum_agent_lbaas_install_agent_packages() { |
12 | 12 |
if is_ubuntu || is_fedora; then |
13 | 13 |
install_package haproxy |
14 |
+ elif is_suse; then |
|
15 |
+ ### FIXME: Find out if package can be pushed to Factory |
|
16 |
+ echo "HAProxy packages can be installed from server:http project in OBS" |
|
14 | 17 |
fi |
15 | 18 |
} |
16 | 19 |
|
... | ... |
@@ -29,8 +29,8 @@ function _quantum_ovs_base_install_agent_packages() { |
29 | 29 |
# Ensure that the service is started |
30 | 30 |
restart_service openvswitch |
31 | 31 |
elif is_suse; then |
32 |
- ### FIXME: Find RPMs for OpenVSwitch |
|
33 |
- echo "OpenVSwitch packages need to be located" |
|
32 |
+ ### FIXME: Find out if package can be pushed to Factory |
|
33 |
+ echo "OpenVSwitch packages can be installed from Cloud:OpenStack:Master in OBS" |
|
34 | 34 |
restart_service openvswitch |
35 | 35 |
fi |
36 | 36 |
} |