change docker image name tp openstack-lenovo

mkdify the repo from thinkcloud to lenovo in the package
change docker image name tp openstack-lenovo

Change-Id: I8d656df1daad8056703fa1645ff1340d75b72e43
Issue-ID: MULTICLOUD-520
Signed-off-by: Changjun Wang <310397125@qq.com>

diff --git a/lenovo/README.md b/lenovo/README.md
index 3751a58..d03e776 100644 (file)
--- a/lenovo/README.md
+++ b/lenovo/README.md
@@ -1,15 +1,15 @@
-# Copyright (c) 2017-2018 Lenovo Systems, Inc.
-#
-# 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.
-
-# Micro service of MultiCloud plugin for thinkcloud.
+# Copyright (c) 2019 Lenovo Systems, Inc.\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
+# Micro service of MultiCloud plugin for Lenovo thinkcloud.\r

diff --git a/lenovo/assembly.xml b/lenovo/assembly.xml
index 97ee741..d7c98d9 100644 (file)
--- a/lenovo/assembly.xml
+++ b/lenovo/assembly.xml
@@ -16,7 +16,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>thinkcloud</id>
+    <id>lenovo</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -73,5 +73,5 @@
             </includes>
         </fileSet>
     </fileSets>
-    <baseDirectory>thinkcloud</baseDirectory>
+    <baseDirectory>lenovo</baseDirectory>
 </assembly>

diff --git a/lenovo/docker/Dockerfile b/lenovo/docker/Dockerfile
index 2a61912..9e98f3f 100644 (file)
--- a/lenovo/docker/Dockerfile
+++ b/lenovo/docker/Dockerfile
@@ -1,50 +1,52 @@
-# 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
-
-RUN apt-get update && apt-get install -y memcached wget unzip gcc && \
-    cd /opt/ && \
-    wget -O multicloud-openstack-thinkcloud.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.0-SNAPSHOT" && \
-    unzip -q -o -B multicloud-openstack-thinkcloud.zip && \
-    chmod +x /opt/thinkcloud/*.sh &&\
-    rm -f multicloud-openstack-thinkcloud.zip &&\
-    pip install -r /opt/thinkcloud/requirements.txt &&\
-    apt-get --purge remove -y wget unzip gcc && \
-    apt-get -y autoremove && \
-    chown onap:onap /opt/thinkcloud -R
-
-USER onap
-
-WORKDIR /opt/thinkcloud
-CMD /bin/sh -c /opt/thinkcloud/run.sh
+# 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 && \\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.0-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 && \\r
+    apt-get -y autoremove && \\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

diff --git a/lenovo/docker/build_image.sh b/lenovo/docker/build_image.sh
index eca8432..7e440d9 100755 (executable)
--- a/lenovo/docker/build_image.sh
+++ b/lenovo/docker/build_image.sh
@@ -1,45 +1,48 @@
-#!/bin/bash
-# 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.
-
-DIRNAME=`dirname $0`
-DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`
-echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
-cd ${DOCKER_BUILD_DIR}
-
-BUILD_ARGS="--no-cache"
-VERSION="1.3.0-SNAPSHOT"
-STAGING="1.3.0-STAGING"
-OS_VERSION="thinkcloud"
-IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
-
-if [ $HTTP_PROXY ]; then
-    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
-fi
-if [ $HTTPS_PROXY ]; then
-    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"
-fi
-
-function build_image {
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .
-}
-
-function push_image {
-    docker push ${IMAGE_NAME}:${VERSION}
-    docker push ${IMAGE_NAME}:latest
-    docker push ${IMAGE_NAME}:${STAGING}
-}
-
-build_image
-push_image
+#!/bin/bash\r
+# 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
+DIRNAME=`dirname $0`\r
+DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd`\r
+echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"\r
+cd ${DOCKER_BUILD_DIR}\r
+\r
+BUILD_ARGS="--no-cache"\r
+ORG="onap"\r
+VERSION="1.3.0-SNAPSHOT"\r
+STAGING="1.3.0-STAGING"\r
+PROJECT="multicloud"\r
+IMAGE="openstack-lenovo"\r
+DOCKER_REPOSITORY="nexus3.onap.org:10003"\r
+IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"\r
+\r
+if [ $HTTP_PROXY ]; then\r
+    BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"\r
+fi\r
+if [ $HTTPS_PROXY ]; then\r
+    BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}"\r
+fi\r
+\r
+function build_image {\r
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .\r
+}\r
+\r
+function push_image {\r
+    docker push ${IMAGE_NAME}:${VERSION}\r
+    docker push ${IMAGE_NAME}:latest\r
+    docker push ${IMAGE_NAME}:${STAGING}\r
+}\r
+\r
+build_image\r
+push_image\r

diff --git a/lenovo/run.sh b/lenovo/run.sh
index b3d98ef..2420d2d 100755 (executable)
--- a/lenovo/run.sh
+++ b/lenovo/run.sh
@@ -1,29 +1,30 @@
-#!/bin/bash
-# Copyright (c) 2017-2018 Lenovo Systems, Inc.
-#
-# 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.
-
-memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
-export PYTHONPATH=lib/share
-
-uwsgi --http :9010 --module thinkcloud.wsgi --master --processes 4
-
-logDir="/var/log/onap/multicloud/openstack/lenovo"
-if [ ! -x  $logDir  ]; then
-       mkdir -p $logDir
-fi
-while [ ! -f $logDir/thinkcloud.log ]; do
-    sleep 1
-done
-
+#!/bin/bash\r
+# Copyright (c) 2017-2018 Lenovo Systems, Inc.\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
+memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid\r
+export PYTHONPATH=lib/share\r
+\r
+#nohup python manage.py runserver 0.0.0.0:9010 2>&1 &\r
+nohup uwsgi --http :9010 --module thinkcloud.wsgi --master --processes 4 &\r
+\r
+logDir="/var/log/onap/multicloud/openstack/lenovo"\r
+if [ ! -x  $logDir  ]; then\r
+       mkdir -p $logDir\r
+fi\r
+while [ ! -f $logDir/thinkcloud.log ]; do\r
+    sleep 1\r
+done\r
+\r
 tail -F $logDir/thinkcloud.log
\ No newline at end of file