Update mc-openstack versin to 1.3.4

Issue-ID: MULTICLOUD-641

Change-Id: I8a331cae52d9f58b3b3ef43ec0091aef32401eb4
Signed-off-by: Liexiang Yue <yueliexiang@chinamobile.com>

diff --git a/fcaps/docker/Dockerfile b/fcaps/docker/Dockerfile
index c08552d..791f03b 100644 (file)
--- 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 3ead51e..5b86d37 100644 (file)
--- 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 c1d41a1..519cbdb 100644 (file)
--- a/fcaps/pom.xml
+++ b/fcaps/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-fcaps</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-fcaps</name>
     <description>multicloud for openstack Wind River Titanium Cloud</description>

diff --git a/lenovo/docker/Dockerfile b/lenovo/docker/Dockerfile
index 768b151..fe54b47 100644 (file)
--- a/lenovo/docker/Dockerfile
+++ b/lenovo/docker/Dockerfile
@@ -1,54 +1,54 @@
-# Copyright (c) 2018 Intel Corporation.\r
-#\r
-# Licensed under the Apache License, Version 2.0 (the "License");\r
-# you may not use this file except in compliance with the License.\r
-# You may obtain a copy of the License at\r
-#\r
-#         http://www.apache.org/licenses/LICENSE-2.0\r
-#\r
-# Unless required by applicable law or agreed to in writing, software\r
-# distributed under the License is distributed on an "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-# See the License for the specific language governing permissions and\r
-# limitations under the License.\r
-\r
-FROM python:2.7-slim\r
-\r
-ARG HTTP_PROXY=${HTTP_PROXY}\r
-ARG HTTPS_PROXY=${HTTPS_PROXY}\r
-\r
-ENV http_proxy $HTTP_PROXY\r
-ENV https_proxy $HTTPS_PROXY\r
-\r
-ENV MSB_ADDR "127.0.0.1"\r
-ENV MSB_PORT "80"\r
-ENV AAI_ADDR "aai.api.simpledemo.openecomp.org"\r
-ENV AAI_PORT "8443"\r
-ENV AAI_SERVICE_URL ""\r
-ENV AAI_SCHEMA_VERSION "v13"\r
-ENV AAI_USERNAME "AAI"\r
-ENV AAI_PASSWORD "AAI"\r
-\r
-EXPOSE 9010\r
-\r
-RUN groupadd -r onap && useradd -r -g onap onap\r
-# COPY ./ /opt/lenovo/\r
-\r
-RUN apt-get update && \\r
-    apt-get install -y memcached wget unzip gcc libssl-dev && \\r
-    cd /opt/ && \\r
-    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" && \\r
-    unzip -q -o -B multicloud-openstack-lenovo.zip && \\r
-    chmod +x /opt/lenovo/*.sh &&\\r
-    rm -f multicloud-openstack-lenovo.zip &&\\r
-    pip install -r /opt/lenovo/requirements.txt &&\\r
-    apt-get --purge remove -y wget unzip gcc libssl-dev && \\r
-    apt-get -y autoremove && \\r
-    mkdir -p /var/log/onap/multicloud/openstack/lenovo && \\r
-    chown onap:onap /var/log/onap -R && \\r
-    chown onap:onap /opt/lenovo -R\r
-\r
-USER onap\r
-\r
-WORKDIR /opt/lenovo\r
-CMD /bin/sh -c /opt/lenovo/run.sh\r
+# 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 e352088..b675d5c 100755 (executable)
--- 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 e673266..a2d829b 100644 (file)
--- a/lenovo/pom.xml
+++ b/lenovo/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-lenovo</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-lenovo</name>
     <description>multicloud for openstack lenovo thinkcloud</description>

diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile
index 0c69da3..1fcaadf 100644 (file)
--- 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 3ab6d9f..01f2648 100644 (file)
--- 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 8276179..4758d9c 100644 (file)
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-newton</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-newton</name>
     <description>multicloud for openstack newton</description>

diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index 967fabe..bff45a7 100644 (file)
--- 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 dad35f0..765bb35 100755 (executable)
--- 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 550e330..d46bc17 100644 (file)
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-ocata</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-ocata</name>
     <description>multicloud for openstack ocata</description>

diff --git a/pike/docker/Dockerfile b/pike/docker/Dockerfile
index 2477adc..819a745 100644 (file)
--- 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 bc6302e..5e6996d 100755 (executable)
--- 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 f1eb9c4..9caea88 100644 (file)
--- a/pike/pom.xml
+++ b/pike/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-pike</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-pike</name>
     <description>multicloud for openstack pike</description>

diff --git a/pom.xml b/pom.xml
index 091f8f0..465f77c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-root</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <name>multicloud-openstack</name>
     <packaging>pom</packaging>
     <description>multicloud openstack</description>

diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile
index e2fbf96..ee627be 100644 (file)
--- 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 11ce096..7650fa4 100755 (executable)
--- 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 ee32474..46ebeb5 100644 (file)
--- a/starlingx/pom.xml
+++ b/starlingx/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-starlingx</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-starlingx</name>
     <description>multicloud for openstack starlingx</description>

diff --git a/version.properties b/version.properties
index ec8e00e..74f2517 100644 (file)
--- 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 71ebef4..e413302 100644 (file)
--- 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 a122a14..be8155c 100644 (file)
--- 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 7cb7117..c68d626 100644 (file)
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-windriver</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-openstack-windriver</name>
     <description>multicloud for openstack Wind River Titanium Cloud</description>