projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fog'
[osm/RO.git]
/
scripts
/
install-openmano.sh
diff --git
a/scripts/install-openmano.sh
b/scripts/install-openmano.sh
index
e0af930
..
a34a0aa
100755
(executable)
--- a/
scripts/install-openmano.sh
+++ b/
scripts/install-openmano.sh
@@
-1,7
+1,7
@@
#!/bin/bash
##
#!/bin/bash
##
-# Copyright 2015 Telef
ónica Investigació
n y Desarrollo, S.A.U.
+# Copyright 2015 Telef
onica Investigacio
n y Desarrollo, S.A.U.
# This file is part of openmano
# All Rights Reserved.
#
# This file is part of openmano
# All Rights Reserved.
#
@@
-259,6
+259,11
@@
then
pip2 install progressbar || exit 1
pip2 install prettytable || exit 1
pip2 install pyvmomi || exit 1
pip2 install progressbar || exit 1
pip2 install prettytable || exit 1
pip2 install pyvmomi || exit 1
+ [ "$_DISTRO" == "Ubuntu" ] && install_packages "genisoimage"
+ [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "genisoimage"
+
+ # required for fog connector
+ pip2 install fog05rest || exit 1
# required for OpenNebula connector
pip2 install untangle || exit 1
# required for OpenNebula connector
pip2 install untangle || exit 1
@@
-270,10
+275,11
@@
then
# install openstack client needed for using openstack as a VIM
[ "$_DISTRO" == "Ubuntu" ] && install_packages "python-novaclient python-keystoneclient python-glanceclient "\
# install openstack client needed for using openstack as a VIM
[ "$_DISTRO" == "Ubuntu" ] && install_packages "python-novaclient python-keystoneclient python-glanceclient "\
- "python-neutronclient python-cinderclient python-openstackclient"
+ "python-neutronclient python-cinderclient python-openstackclient "\
+ "python-networking-l2gw"
[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-devel" && easy_install \
python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient \
[ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "python-devel" && easy_install \
python-novaclient python-keystoneclient python-glanceclient python-neutronclient python-cinderclient \
- python-openstackclient #TODO revise if gcc python-pip is needed
+ python-openstackclient
python-networking-l2gw
#TODO revise if gcc python-pip is needed
fi # [[ -z "$NO_PACKAGES" ]]
if [[ -z $NOCLONE ]]; then
fi # [[ -z "$NO_PACKAGES" ]]
if [[ -z $NOCLONE ]]; then