From: Eduardo Sousa Date: Fri, 21 Sep 2018 15:34:29 +0000 (+0100) Subject: Renaming PM to POL X-Git-Tag: v5.0.0~109 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=280ccc770758dfd2921aacc2a13072840dd9439a;p=osm%2Fdevops.git Renaming PM to POL Updated all the references from PM to POL. Change-Id: I5d8c228bfa5498d810eb98d55d9f30a681a2730d Signed-off-by: Eduardo Sousa --- diff --git a/docker/Makefile b/docker/Makefile index 0dcb3dfe..6e6ae572 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -13,5 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # -SUBDIRS = MON NBI osmclient RO LCM light-ui pm Keystone +SUBDIRS = MON NBI osmclient RO LCM light-ui POL Keystone include mk/dirs.mk diff --git a/docker/POL/Dockerfile b/docker/POL/Dockerfile new file mode 100644 index 00000000..f5ce0571 --- /dev/null +++ b/docker/POL/Dockerfile @@ -0,0 +1,62 @@ +# Copyright 2018 Whitestack, LLC +# ************************************************************* + +# This file is part of OSM Monitoring module +# All Rights Reserved to Whitestack, LLC + +# 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. + +# For those usages not covered by the Apache License, Version 2.0 please +# contact: bdiaz@whitestack.com or glavado@whitestack.com +## + +FROM ubuntu:16.04 + +LABEL authors="Benjamín Díaz" + +RUN apt-get --yes update \ + && apt-get --yes install python3 python3-pip libmysqlclient-dev git \ + && pip3 install pip==9.0.3 + +RUN apt-get update && apt-get -y install curl software-properties-common + +RUN apt-get --yes update \ + && apt-get --yes install git python python-pip python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \ + && pip3 install pip==9.0.3 + +ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian +ARG RELEASE=ReleaseFOUR-daily +ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg +ARG REPOSITORY=testing + +RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - +RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} POL common" && apt update + +ARG POL_VERSION +ARG COMMON_VERSION + +RUN apt-get --yes update && apt-get -y install python3-osm-policy-module${POL_VERSION} + +ENV OSMPOL_MESSAGE_DRIVER kafka +ENV OSMPOL_MESSAGE_HOST kafka +ENV OSMPOL_MESSAGE_PORT 9092 + +ENV OSMPOL_DATABASE_DRIVER mongo +ENV OSMPOL_DATABASE_HOST mongo +ENV OSMPOL_DATABASE_PORT 27017 + +ENV OSMPOL_SQL_DATABASE_URI sqlite:///mon_sqlite.db + +ENV OSMPOL_LOG_LEVEL INFO + +CMD osm-policy-agent diff --git a/docker/POL/Makefile b/docker/POL/Makefile new file mode 100644 index 00000000..d64462ab --- /dev/null +++ b/docker/POL/Makefile @@ -0,0 +1,3 @@ +include ../mk/Makefile.include + +MDG=$(shell basename $(CURDIR)) diff --git a/docker/pm/Dockerfile b/docker/pm/Dockerfile deleted file mode 100644 index 64097404..00000000 --- a/docker/pm/Dockerfile +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2018 Whitestack, LLC -# ************************************************************* - -# This file is part of OSM Monitoring module -# All Rights Reserved to Whitestack, LLC - -# 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. - -# For those usages not covered by the Apache License, Version 2.0 please -# contact: bdiaz@whitestack.com or glavado@whitestack.com -## - -FROM ubuntu:16.04 - -LABEL authors="Benjamín Díaz" - -RUN apt-get --yes update \ - && apt-get --yes install python3 python3-pip libmysqlclient-dev git \ - && pip3 install pip==9.0.3 - -RUN apt-get update && apt-get -y install curl software-properties-common - -RUN apt-get --yes update \ - && apt-get --yes install git python python-pip python3 python3-pip libmysqlclient-dev libssl-dev libffi-dev \ - && pip3 install pip==9.0.3 - -ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian -ARG RELEASE=ReleaseFOUR-daily -ARG REPOSITORY_KEY=OSM%20ETSI%20Release%20Key.gpg -ARG REPOSITORY=testing - -RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - -RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} POL common" && apt update - -ARG POL_VERSION -ARG COMMON_VERSION - -RUN apt-get --yes update && apt-get -y install python3-osm-policy-module${POL_VERSION} - -#CMD bash /MON/policy_module/scripts/gen_config_from_env.sh && osm-policy-agent --config osm_policy_agent.cfg diff --git a/docker/pm/Makefile b/docker/pm/Makefile deleted file mode 100644 index d64462ab..00000000 --- a/docker/pm/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -include ../mk/Makefile.include - -MDG=$(shell basename $(CURDIR))