From: garciadeblas Date: Fri, 15 Jun 2018 17:23:45 +0000 (+0200) Subject: replacing ocata Openstack libraries by pike X-Git-Tag: v5.0.0~45 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F81%2F6281%2F3;p=osm%2FRO.git replacing ocata Openstack libraries by pike Change-Id: Id78c1d361e6c0502ea03ce0944da58df908c7501 Signed-off-by: garciadeblas --- diff --git a/Dockerfile b/Dockerfile index 0fb074ea..fccf66bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive pip install -U pyang pyangbind && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-yaml python-netaddr python-boto && \ DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ - DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata && \ + DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:pike && \ DEBIAN_FRONTEND=noninteractive apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install python-novaclient python-keystoneclient python-glanceclient python-cinderclient python-neutronclient && \ DEBIAN_FRONTEND=noninteractive pip install -U progressbar pyvmomi pyvcloud==19.1.1 && \ diff --git a/docker/Dockerfile-local b/docker/Dockerfile-local index 9dc2c93e..b1ad1021 100644 --- a/docker/Dockerfile-local +++ b/docker/Dockerfile-local @@ -8,7 +8,7 @@ COPY docker/scripts/ /bin/RO RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \ - DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:ocata && \ + DEBIAN_FRONTEND=noninteractive add-apt-repository -y cloud-archive:pike && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install git make python python-pip debhelper && \ DEBIAN_FRONTEND=noninteractive apt-get -y install wget tox && \ diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh index 0b2ba695..54896c86 100755 --- a/scripts/install-openmano.sh +++ b/scripts/install-openmano.sh @@ -224,7 +224,7 @@ then "##### UPDATE REPOSITORIES #####\n"\ "#################################################################" [ "$_DISTRO" == "Ubuntu" ] && apt-get update -y && - add-apt-repository -y cloud-archive:ocata && apt-get update -y + add-apt-repository -y cloud-archive:pike && apt-get update -y [ "$_DISTRO" == "CentOS" -o "$_DISTRO" == "Red" ] && yum check-update -y [ "$_DISTRO" == "CentOS" ] && yum install -y epel-release