From 751a4ef6a5853c1cafb352ff1800793c4713667f Mon Sep 17 00:00:00 2001 From: tierno Date: Thu, 22 Feb 2018 12:24:16 +0100 Subject: [PATCH] Source installation, use ocata openstack client Change-Id: I15c30991a8ac5f622699ba6099865e7f696f115d Signed-off-by: tierno --- openmanod | 2 +- scripts/install-openmano.sh | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openmanod b/openmanod index 501573e6..aaa00cca 100755 --- a/openmanod +++ b/openmanod @@ -48,7 +48,7 @@ import osm_ro __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ = "$26-aug-2014 11:09:29$" -__version__ = "0.5.54-r564" +__version__ = "0.5.55-r565" version_date = "Mar 2018" database_version = 28 # expected database schema version diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh index 6be885ec..74bc0a59 100755 --- a/scripts/install-openmano.sh +++ b/scripts/install-openmano.sh @@ -223,7 +223,8 @@ then "#################################################################\n"\ "##### UPDATE REPOSITORIES #####\n"\ "#################################################################" - [ "$_DISTRO" == "Ubuntu" ] && apt-get update -y + [ "$_DISTRO" == "Ubuntu" ] && apt-get update -y && + add-apt-repository -y cloud-archive:ocata && apt-get update -y [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && yum check-update -y [ "$_DISTRO" == "CentOS" ] && yum install -y epel-release @@ -242,8 +243,12 @@ then "#################################################################\n"\ "##### INSTALL PYTHON PACKAGES #####\n"\ "#################################################################" - [ "$_DISTRO" == "Ubuntu" ] && install_packages "python-yaml python-bottle python-mysqldb python-jsonschema python-paramiko python-argcomplete python-requests python-logutils libxml2-dev libxslt-dev python-dev python-pip python-crypto" - [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "PyYAML MySQL-python python-jsonschema python-paramiko python-argcomplete python-requests python-logutils libxslt-devel libxml2-devel python-devel python-pip python-crypto" + [ "$_DISTRO" == "Ubuntu" ] && install_packages "python-yaml python-bottle python-mysqldb python-jsonschema "\ + "python-paramiko python-argcomplete python-requests python-logutils libxml2-dev libxslt-dev python-dev "\ + "python-pip python-crypto" + [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && install_packages "PyYAML MySQL-python python-jsonschema "\ + "python-paramiko python-argcomplete python-requests python-logutils libxslt-devel libxml2-devel python-devel "\ + "python-pip python-crypto" # The only way to install python-bottle on Centos7 is with easy_install or pip [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && easy_install -U bottle -- 2.25.1