7 files changed, 105 insertions, 6 deletions
diff --git a/starlingx/README.md b/starlingx/README.md
index c8b300a5..48c7be7d 100644
--- a/starlingx/README.md
+++ b/starlingx/README.md
@@ -13,3 +13,28 @@
 # limitations under the License.
 
 # Micro service of MultiCloud plugin for starlingx.
+
+
+docker-compose -f docker-compose-starlingx.yml build
+
+docker-compose -f docker-compose-starlingx.yml up -d
+
+docker ps
+
+### Test memcached
+docker exec -it openstack_worker_1 sh
+
+cat <<EOF>testmemcached.py
+import memcache
+mem = memcache.Client(['memcached:11211'], debug=1)
+mem.set("testkey1","testvalue1")
+value1 = mem.get("testkey1")
+print("memcached is working" if value1=="testvalue1" else "memcached is not working")
+EOF
+
+python testmemcached.py
+
+exit
+
+docker-compose -f docker-compose-starlingx.yml down
+
diff --git a/starlingx/docker/Dockerfile b/starlingx/docker/Dockerfile
index 79b351d3..d0cb914d 100644
--- a/starlingx/docker/Dockerfile
+++ b/starlingx/docker/Dockerfile
@@ -39,7 +39,7 @@ USER root
 # COPY ./ /opt/
 COPY ./multicloud-openstack-starlingx-*.zip /opt/multicloud-openstack-starlingx.zip
 RUN apk update && \
-    apk add pcre pcre-dev uwsgi memcached wget unzip gcc make libc-dev libffi-dev openssl-dev && \
+    apk add pcre pcre-dev uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \
     cd /opt/ && \
     unzip -q -o -B /opt/multicloud-openstack-starlingx.zip -d /opt/ && \
     rm -f /opt/multicloud-openstack-starlingx.zip && \
diff --git a/starlingx/docker/Dockerfile4composer b/starlingx/docker/Dockerfile4composer
new file mode 100644
index 00000000..e99dce8d
--- /dev/null
+++ b/starlingx/docker/Dockerfile4composer
@@ -0,0 +1,57 @@
+# Copyright (c) 2019 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:3.8-alpine
+FROM nexus3.onap.org:10001/onap/integration-python:9.1.0
+
+ARG HTTP_PROXY=${HTTP_PROXY}
+ARG HTTPS_PROXY=${HTTPS_PROXY}
+
+ENV http_proxy $HTTP_PROXY
+ENV https_proxy $HTTPS_PROXY
+
+ENV MSB_PROTO "http"
+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 9009
+
+# RUN addgroup -S onap && adduser -S -G onap onap
+USER root
+
+COPY ./starlingx /opt/starlingx/
+COPY ./share /opt/starlingx/lib/share
+# COPY ./ /opt/
+# COPY ./multicloud-openstack-starlingx-*.zip /opt/multicloud-openstack-starlingx.zip
+RUN apk update && \
+    apk add pcre pcre-dev uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \
+    cd /opt/ && \
+    pip3 install --no-cache-dir -r /opt/starlingx/requirements.txt && \
+    pip3 install --no-cache-dir -r /opt/starlingx/uwsgi-requirements.txt && \
+    apk del wget unzip gcc make libc-dev libffi-dev openssl-dev pcre-dev && \
+    mkdir -p /var/log/onap/multicloud/openstack/starlingx && \
+    chown onap:onap /var/log/onap -R && \
+    chown onap:onap /opt/starlingx -R
+    
+RUN mkdir -p /var/log/onap/multicloud/openstack/starlingx/
+
+USER onap
+WORKDIR /opt/starlingx
+CMD /bin/sh -c "/opt/starlingx/run.sh"
diff --git a/starlingx/run.sh b/starlingx/run.sh
index 66dd111f..81d2df39 100755
--- a/starlingx/run.sh
+++ b/starlingx/run.sh
@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid
+# memcached should be provided as sidecar to avoid GPLv3 license issue
+# memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid
 export PYTHONPATH=lib/share
 # uwsgi --http :9009 --module starlingx.wsgi --master --processes 4
 
diff --git a/starlingx/starlingx/pub/config/log.yml b/starlingx/starlingx/pub/config/log.yml
index ef68a653..d819c233 100644
--- a/starlingx/starlingx/pub/config/log.yml
+++ b/starlingx/starlingx/pub/config/log.yml
@@ -16,11 +16,11 @@ version: 1
 disable_existing_loggers: False
 
 loggers:
-    starlingx:
+    starlingx_base:
       handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
-    starlingx_base:
+    starlingx:
       handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
@@ -32,6 +32,7 @@ loggers:
       handlers: [console_handler, file_handler]
       level: "DEBUG"
       propagate: False
+
 handlers:
     console_handler:
         level: "DEBUG"
@@ -44,3 +45,7 @@ handlers:
         formatter: "standard"
         maxBytes: 52428800
         backupCount: 10
+
+formatters:
+    standard:
+        format: "%(asctime)s|||||%(name)s||%(thread)||%(funcName)s||%(levelname)s||%(message)s"
diff --git a/starlingx/starlingx/settings.py b/starlingx/starlingx/settings.py
index d5362e4b..c19e8571 100644
--- a/starlingx/starlingx/settings.py
+++ b/starlingx/starlingx/settings.py
@@ -80,14 +80,25 @@ TIME_ZONE = 'UTC'
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
 STATIC_URL = '/static/'
+MEMCACHED_HOST = os.environ.get('MEMCACHED_HOST', '127.0.0.1')
+MEMCACHED_PORT = os.environ.get('MEMCACHED_PORT', '11211')
+DEFAULT_CACHE_BACKEND_LOCATION = "%s:%s" % (MEMCACHED_HOST, MEMCACHED_PORT)
 
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
+        'LOCATION': DEFAULT_CACHE_BACKEND_LOCATION,
     }
 }
 
+# [RABBITMQ]
+RABBITMQ_DEFAULT_USER = os.environ.get('RABBITMQ_DEFAULT_USER', 'guest')
+RABBITMQ_DEFAULT_PASS = os.environ.get('RABBITMQ_DEFAULT_PASS', 'guest')
+RABBITMQ_HOST = os.environ.get('RABBITMQ_HOST', 'localhost')
+RABBITMQ_PORT = os.environ.get('RABBITMQ_PORT', '5672')
+RABBITMQ_URL = "amqp://%s:%s@%s:%s//" % (
+    RABBITMQ_DEFAULT_USER, RABBITMQ_DEFAULT_PASS, RABBITMQ_HOST, RABBITMQ_PORT)
+
 # [MSB]
 DEFAULT_MSB_PROTO = "http"
 MSB_SERVICE_PROTOCOL = os.environ.get('MSB_PROTO', DEFAULT_MSB_PROTO)
diff --git a/starlingx/stop.sh b/starlingx/stop.sh
index 3f7fd2a1..8de97f96 100755
--- a/starlingx/stop.sh
+++ b/starlingx/stop.sh
@@ -15,4 +15,4 @@
 
 #ps auxww | grep 'manage.py runserver 0.0.0.0:9009' | awk '{print $2}' | xargs kill -9
 ps auxww |grep 'uwsgi --http :9009 --module starlingx.wsgi --master' |awk '{print $2}' |xargs kill -9
-ps auxww | grep 'memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9
+# ps auxww | grep 'memcached -d -m 2048 -c 1024 -p 11211 -P /tmp/memcached1.pid' | awk '{print $2}' | xargs kill -9