Update mc-openstack versin to 1.3.4

Issue-ID: MULTICLOUD-641

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

2 files changed, 56 insertions, 56 deletions

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"