From cc399bdde795b839add743b7ad6e5f97d4b895b6 Mon Sep 17 00:00:00 2001 From: Liexiang Yue Date: Wed, 22 May 2019 12:12:25 +0800 Subject: Update mc-openstack versin to 1.3.4 Issue-ID: MULTICLOUD-641 Change-Id: I8a331cae52d9f58b3b3ef43ec0091aef32401eb4 Signed-off-by: Liexiang Yue --- fcaps/docker/Dockerfile | 2 +- fcaps/docker/build_image.sh | 4 +- fcaps/pom.xml | 2 +- lenovo/docker/Dockerfile | 108 ++++++++++++++++++++-------------------- lenovo/docker/build_image.sh | 4 +- lenovo/pom.xml | 2 +- newton/docker/Dockerfile | 2 +- newton/docker/build_image.sh | 4 +- newton/pom.xml | 2 +- ocata/docker/Dockerfile | 2 +- ocata/docker/build_image.sh | 4 +- ocata/pom.xml | 2 +- pike/docker/Dockerfile | 2 +- pike/docker/build_image.sh | 4 +- pike/pom.xml | 2 +- pom.xml | 2 +- starlingx/docker/Dockerfile | 2 +- starlingx/docker/build_image.sh | 4 +- starlingx/pom.xml | 2 +- version.properties | 2 +- windriver/docker/Dockerfile | 2 +- windriver/docker/build_image.sh | 4 +- windriver/pom.xml | 2 +- 23 files changed, 83 insertions(+), 83 deletions(-) diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile index c08552db..791f03bb 100644 --- a/fcaps/docker/Dockerfile +++ b/fcaps/docker/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup -S onap && adduser -S -G onap onap RUN apk update && \ apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ - wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.3.3-SNAPSHOT" && \ + wget -O multicloud-openstack-fcaps.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-fcaps&e=zip&v=1.3.4-SNAPSHOT" && \ unzip -q -o -B multicloud-openstack-fcaps.zip && \ chmod +x /opt/fcaps/*.sh && \ rm -f multicloud-openstack-fcaps.zip && \ diff --git a/fcaps/docker/build_image.sh b/fcaps/docker/build_image.sh index 3ead51e3..5b86d375 100644 --- a/fcaps/docker/build_image.sh +++ b/fcaps/docker/build_image.sh @@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.3-SNAPSHOT" -STAGING="1.3.3-STAGING" +VERSION="1.3.4-SNAPSHOT" +STAGING="1.3.4-STAGING" PROJECT="multicloud" IMAGE="openstack-fcaps" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/fcaps/pom.xml b/fcaps/pom.xml index c1d41a10..519cbdb1 100644 --- a/fcaps/pom.xml +++ b/fcaps/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-fcaps - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom multicloud-openstack-fcaps multicloud for openstack Wind River Titanium Cloud diff --git a/lenovo/docker/Dockerfile b/lenovo/docker/Dockerfile index 768b151c..fe54b479 100644 --- a/lenovo/docker/Dockerfile +++ b/lenovo/docker/Dockerfile @@ -1,54 +1,54 @@ -# Copyright (c) 2018 Intel Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM python:2.7-slim - -ARG HTTP_PROXY=${HTTP_PROXY} -ARG HTTPS_PROXY=${HTTPS_PROXY} - -ENV http_proxy $HTTP_PROXY -ENV https_proxy $HTTPS_PROXY - -ENV MSB_ADDR "127.0.0.1" -ENV MSB_PORT "80" -ENV AAI_ADDR "aai.api.simpledemo.openecomp.org" -ENV AAI_PORT "8443" -ENV AAI_SERVICE_URL "" -ENV AAI_SCHEMA_VERSION "v13" -ENV AAI_USERNAME "AAI" -ENV AAI_PASSWORD "AAI" - -EXPOSE 9010 - -RUN groupadd -r onap && useradd -r -g onap onap -# COPY ./ /opt/lenovo/ - -RUN apt-get update && \ - apt-get install -y memcached wget unzip gcc libssl-dev && \ - cd /opt/ && \ - wget -O multicloud-openstack-lenovo.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-lenovo&e=zip&v=1.3.3-SNAPSHOT" && \ - unzip -q -o -B multicloud-openstack-lenovo.zip && \ - chmod +x /opt/lenovo/*.sh &&\ - rm -f multicloud-openstack-lenovo.zip &&\ - pip install -r /opt/lenovo/requirements.txt &&\ - apt-get --purge remove -y wget unzip gcc libssl-dev && \ - apt-get -y autoremove && \ - mkdir -p /var/log/onap/multicloud/openstack/lenovo && \ - chown onap:onap /var/log/onap -R && \ - chown onap:onap /opt/lenovo -R - -USER onap - -WORKDIR /opt/lenovo -CMD /bin/sh -c /opt/lenovo/run.sh +# Copyright (c) 2018 Intel Corporation. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +FROM python:2.7-slim + +ARG HTTP_PROXY=${HTTP_PROXY} +ARG HTTPS_PROXY=${HTTPS_PROXY} + +ENV http_proxy $HTTP_PROXY +ENV https_proxy $HTTPS_PROXY + +ENV MSB_ADDR "127.0.0.1" +ENV MSB_PORT "80" +ENV AAI_ADDR "aai.api.simpledemo.openecomp.org" +ENV AAI_PORT "8443" +ENV AAI_SERVICE_URL "" +ENV AAI_SCHEMA_VERSION "v13" +ENV AAI_USERNAME "AAI" +ENV AAI_PASSWORD "AAI" + +EXPOSE 9010 + +RUN groupadd -r onap && useradd -r -g onap onap +# COPY ./ /opt/lenovo/ + +RUN apt-get update && \ + apt-get install -y memcached wget unzip gcc libssl-dev && \ + cd /opt/ && \ + wget -O multicloud-openstack-lenovo.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-lenovo&e=zip&v=1.3.4-SNAPSHOT" && \ + unzip -q -o -B multicloud-openstack-lenovo.zip && \ + chmod +x /opt/lenovo/*.sh &&\ + rm -f multicloud-openstack-lenovo.zip &&\ + pip install -r /opt/lenovo/requirements.txt &&\ + apt-get --purge remove -y wget unzip gcc libssl-dev && \ + apt-get -y autoremove && \ + mkdir -p /var/log/onap/multicloud/openstack/lenovo && \ + chown onap:onap /var/log/onap -R && \ + chown onap:onap /opt/lenovo -R + +USER onap + +WORKDIR /opt/lenovo +CMD /bin/sh -c /opt/lenovo/run.sh diff --git a/lenovo/docker/build_image.sh b/lenovo/docker/build_image.sh index e3520884..b675d5ca 100755 --- a/lenovo/docker/build_image.sh +++ b/lenovo/docker/build_image.sh @@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.3-SNAPSHOT" -STAGING="1.3.3-STAGING" +VERSION="1.3.4-SNAPSHOT" +STAGING="1.3.4-STAGING" PROJECT="multicloud" IMAGE="openstack-lenovo" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/lenovo/pom.xml b/lenovo/pom.xml index e6732660..a2d829be 100644 --- a/lenovo/pom.xml +++ b/lenovo/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-lenovo - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom multicloud-openstack-lenovo multicloud for openstack lenovo thinkcloud diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile index 0c69da39..1fcaadf2 100644 --- a/newton/docker/Dockerfile +++ b/newton/docker/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update && \ apt-get install -y memcached && \ apt-get install -y unzip && \ cd /opt/ && \ - wget -O multicloud-openstack-newton.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-newton&e=zip&v=1.3.3-SNAPSHOT" && \ + wget -O multicloud-openstack-newton.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-newton&e=zip&v=1.3.4-SNAPSHOT" && \ unzip -q -o -B multicloud-openstack-newton.zip && \ chmod +x /opt/newton/*.sh && \ rm -f multicloud-openstack-newton.zip && \ diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh index 3ab6d9f6..01f26484 100644 --- a/newton/docker/build_image.sh +++ b/newton/docker/build_image.sh @@ -20,8 +20,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.3-SNAPSHOT" -STAGING="1.3.3-STAGING" +VERSION="1.3.4-SNAPSHOT" +STAGING="1.3.4-STAGING" PROJECT="multicloud" IMAGE="openstack-newton" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/newton/pom.xml b/newton/pom.xml index 8276179a..4758d9c5 100644 --- a/newton/pom.xml +++ b/newton/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-newton - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom multicloud-openstack-newton multicloud for openstack newton diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile index 967fabe3..bff45a7e 100644 --- a/ocata/docker/Dockerfile +++ b/ocata/docker/Dockerfile @@ -36,7 +36,7 @@ RUN groupadd -r onap && useradd -r -g onap onap RUN apt-get update && \ apt-get install -y memcached wget unzip gcc libssl-dev && \ cd /opt/ && \ - wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.3.3-SNAPSHOT" && \ + wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.3.4-SNAPSHOT" && \ unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \ rm -f /opt/multicloud-openstack-ocata.zip && \ pip install -r /opt/ocata/requirements.txt && \ diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh index dad35f0a..765bb35f 100755 --- a/ocata/docker/build_image.sh +++ b/ocata/docker/build_image.sh @@ -19,8 +19,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" -VERSION="1.3.3-SNAPSHOT" -STAGING="1.3.3-STAGING" +VERSION="1.3.4-SNAPSHOT" +STAGING="1.3.4-STAGING" OS_VERSION="ocata" IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}" diff --git a/ocata/pom.xml b/ocata/pom.xml index 550e3307..d46bc175 100644 --- a/ocata/pom.xml +++ b/ocata/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-ocata - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom multicloud-openstack-ocata multicloud for openstack ocata diff --git a/pike/docker/Dockerfile b/pike/docker/Dockerfile index 2477adce..819a745f 100644 --- a/pike/docker/Dockerfile +++ b/pike/docker/Dockerfile @@ -36,7 +36,7 @@ RUN groupadd -r onap && useradd -r -g onap onap RUN apt-get update && \ apt-get install -y memcached wget unzip gcc libssl-dev && \ cd /opt/ && \ - wget -O /opt/multicloud-openstack-pike.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-pike&e=zip&v=1.3.3-SNAPSHOT" && \ + wget -O /opt/multicloud-openstack-pike.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-pike&e=zip&v=1.3.4-SNAPSHOT" && \ unzip -q -o -B /opt/multicloud-openstack-pike.zip -d /opt/ && \ rm -f /opt/multicloud-openstack-pike.zip && \ pip install -r /opt/pike/requirements.txt && \ diff --git a/pike/docker/build_image.sh b/pike/docker/build_image.sh index bc6302ee..5e6996dd 100755 --- a/pike/docker/build_image.sh +++ b/pike/docker/build_image.sh @@ -20,8 +20,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" -VERSION="1.3.3-SNAPSHOT" -STAGING="1.3.3-STAGING" +VERSION="1.3.4-SNAPSHOT" +STAGING="1.3.4-STAGING" OS_VERSION="pike" IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}" diff --git a/pike/pom.xml b/pike/pom.xml index f1eb9c4b..9caea884 100644 --- a/pike/pom.xml +++ b/pike/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-pike - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom multicloud-openstack-pike multicloud for openstack pike diff --git a/pom.xml b/pom.xml index 091f8f0d..465f77c8 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-root - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT multicloud-openstack pom multicloud openstack diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile index e2fbf960..ee627bef 100644 --- a/starlingx/docker/Dockerfile +++ b/starlingx/docker/Dockerfile @@ -36,7 +36,7 @@ RUN addgroup -S onap && adduser -S -G onap onap RUN apk update && \ apk add bash uwsgi curl memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ - wget -O /opt/multicloud-openstack-starlingx.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.3.3-SNAPSHOT" && \ + wget -O /opt/multicloud-openstack-starlingx.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-starlingx&e=zip&v=1.3.4-SNAPSHOT" && \ unzip -q -o -B /opt/multicloud-openstack-starlingx.zip -d /opt/ && \ rm -f /opt/multicloud-openstack-starlingx.zip && \ pip install -r /opt/starlingx/requirements.txt && \ diff --git a/starlingx/docker/build_image.sh b/starlingx/docker/build_image.sh index 11ce0968..7650fa4e 100755 --- a/starlingx/docker/build_image.sh +++ b/starlingx/docker/build_image.sh @@ -20,8 +20,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}" cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" -VERSION="1.3.3-SNAPSHOT" -STAGING="1.3.3-STAGING" +VERSION="1.3.4-SNAPSHOT" +STAGING="1.3.4-STAGING" OS_VERSION="starlingx" IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}" diff --git a/starlingx/pom.xml b/starlingx/pom.xml index ee324741..46ebeb56 100644 --- a/starlingx/pom.xml +++ b/starlingx/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-starlingx - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom multicloud-openstack-starlingx multicloud for openstack starlingx diff --git a/version.properties b/version.properties index ec8e00ed..74f25173 100644 --- a/version.properties +++ b/version.properties @@ -18,7 +18,7 @@ major=1 minor=3 -patch=3 +patch=4 base_version=${major}.${minor}.${patch} diff --git a/windriver/docker/Dockerfile b/windriver/docker/Dockerfile index 71ebef4d..e413302f 100644 --- a/windriver/docker/Dockerfile +++ b/windriver/docker/Dockerfile @@ -22,7 +22,7 @@ RUN addgroup -S onap && adduser -S -G onap onap RUN apk update && \ apk add uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ - wget -O multicloud-openstack-windriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-windriver&e=zip&v=1.3.3-SNAPSHOT" && \ + wget -O multicloud-openstack-windriver.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-windriver&e=zip&v=1.3.4-SNAPSHOT" && \ unzip -q -o -B multicloud-openstack-windriver.zip && \ chmod +x /opt/windriver/*.sh && \ rm -f multicloud-openstack-windriver.zip && \ diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh index a122a14d..be8155cf 100644 --- a/windriver/docker/build_image.sh +++ b/windriver/docker/build_image.sh @@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.3-SNAPSHOT" -STAGING="1.3.3-STAGING" +VERSION="1.3.4-SNAPSHOT" +STAGING="1.3.4-STAGING" PROJECT="multicloud" IMAGE="openstack-windriver" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/windriver/pom.xml b/windriver/pom.xml index 7cb71170..c68d6267 100644 --- a/windriver/pom.xml +++ b/windriver/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.openstack multicloud-openstack-windriver - 1.3.3-SNAPSHOT + 1.3.4-SNAPSHOT pom multicloud-openstack-windriver multicloud for openstack Wind River Titanium Cloud -- cgit 1.2.3-korg