diff options
author | Bin Yang <bin.yang@windriver.com> | 2022-03-21 22:40:51 +0800 |
---|---|---|
committer | Bin Yang <bin.yang@windriver.com> | 2022-03-22 14:31:13 +0800 |
commit | de7df2bb51ecd068d3eae6cf314b20c744e96927 (patch) | |
tree | b55034272a7d683dba1a95c504c6594d970645d3 /pike | |
parent | 3bd3e44e2c9533b96f6f6664f9d6ed2150515955 (diff) |
memcached container as sidecar1.5.7
To fix the dependency on memcached which depends on the GPLv3 licensed gdbm indirectly,
Use sidecar to integrate memcached from dockerhub
Add docker-composer scripts to support local test
Issue-ID: MULTICLOUD-1457
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I55a156c0af158535dccfa87e7b9603e47be4d9c1
Diffstat (limited to 'pike')
-rw-r--r-- | pike/README.md | 24 | ||||
-rw-r--r-- | pike/docker/Dockerfile | 2 | ||||
-rw-r--r-- | pike/docker/Dockerfile4composer | 56 | ||||
-rw-r--r-- | pike/pike/settings.py | 13 | ||||
-rwxr-xr-x | pike/run.sh | 3 | ||||
-rwxr-xr-x | pike/stop.sh | 2 |
6 files changed, 96 insertions, 4 deletions
diff --git a/pike/README.md b/pike/README.md index e6231224..a7f27615 100644 --- a/pike/README.md +++ b/pike/README.md @@ -13,3 +13,27 @@ # limitations under the License. # Micro service of MultiCloud plugin for pike. +### local test with docker-composer: + +docker-compose -f docker-compose-pike.yml build + +docker-compose -f docker-compose-pike.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-pike.yml down
\ No newline at end of file diff --git a/pike/docker/Dockerfile b/pike/docker/Dockerfile index 7ce54023..ce239b22 100644 --- a/pike/docker/Dockerfile +++ b/pike/docker/Dockerfile @@ -38,7 +38,7 @@ USER root COPY ./multicloud-openstack-pike-*.zip /opt/multicloud-openstack-pike.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-pike.zip -d /opt/ && \ rm -f /opt/multicloud-openstack-pike.zip && \ diff --git a/pike/docker/Dockerfile4composer b/pike/docker/Dockerfile4composer new file mode 100644 index 00000000..cbc5c8cf --- /dev/null +++ b/pike/docker/Dockerfile4composer @@ -0,0 +1,56 @@ +# 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: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 9007 + +# RUN addgroup -S onap && adduser -S -G onap onap +USER root + +COPY ./pike /opt/pike/ +COPY ./share /opt/pike/lib/share +# COPY ./multicloud-openstack-pike-*.zip /opt/multicloud-openstack-pike.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/pike/requirements.txt && \ + pip3 install --no-cache-dir -r /opt/pike/uwsgi-requirements.txt && \ + apk del wget unzip gcc make libc-dev libffi-dev openssl-dev pcre-dev && \ + mkdir -p /var/log/onap/multicloud/openstack/pike && \ + chown onap:onap /var/log/onap -R && \ + chown onap:onap /opt/pike -R + +RUN mkdir -p /var/log/onap/multicloud/openstack/pike/ + +USER onap +WORKDIR /opt/pike +CMD /bin/sh -c "/opt/pike/run.sh"
\ No newline at end of file diff --git a/pike/pike/settings.py b/pike/pike/settings.py index 83c7415f..d765ca37 100644 --- a/pike/pike/settings.py +++ b/pike/pike/settings.py @@ -79,14 +79,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/pike/run.sh b/pike/run.sh index c4ac483a..fb81ee93 100755 --- a/pike/run.sh +++ b/pike/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 #nohup python manage.py runserver 0.0.0.0:9007 2>&1 & diff --git a/pike/stop.sh b/pike/stop.sh index 6343dd1b..77ee7036 100755 --- a/pike/stop.sh +++ b/pike/stop.sh @@ -15,4 +15,4 @@ #ps auxww | grep 'manage.py runserver 0.0.0.0:9007' | awk '{print $2}' | xargs kill -9 ps auxww |grep 'uwsgi --http :9007 --module pike.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 |