X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=docker%2FRO%2FDockerfile;h=24b14251e4bf2df9d6ecf820890705fad836732a;hb=a4eb784ff54974255c7f2ce2e4ba6ecdc30cb5c8;hp=896902d5bba37c027cff688437d851ee578843ef;hpb=dd0fcc58aaf6b5b9b461658d56ee1ab49df18874;p=osm%2Fdevops.git

diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 896902d5..24b14251 100644
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -24,25 +24,30 @@ RUN apt-get update && apt-get -y install curl software-properties-common git tox
     && python3 -m pip install --upgrade pip && python3 -m pip install pyangbind networking-l2gw
 
 ARG REPOSITORY_BASE=http://osm-download.etsi.org/repository/osm/debian
-ARG RELEASE=ReleaseSEVEN-daily
+ARG RELEASE=ReleaseNINE-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} RO IM common openvim" && apt-get update
+RUN add-apt-repository -y "deb ${REPOSITORY_BASE}/${RELEASE} ${REPOSITORY} RO IM common" && apt-get update
 
 ARG RO_VERSION
-ARG IM_VERSION
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python3-osm-ro${RO_VERSION} python3-osm-im${IM_VERSION} \
-    python3-osm-roclient${RO_VERSION} \
-    python3-osm-rosdn-tapi${RO_VERSION} python3-osm-rosdn-dynpac${RO_VERSION} python3-osm-rosdn-onosof${RO_VERSION} \
-    python3-osm-rosdn-onos-vpls${RO_VERSION} python3-osm-rosdn-floodlightof${RO_VERSION} \
-    python3-osm-rovim-vmware${RO_VERSION} python3-osm-rovim-openstack${RO_VERSION} \
-    python3-osm-rovim-openvim${RO_VERSION} python3-osm-rovim-azure${RO_VERSION} \
-    python3-osm-rovim-aws${RO_VERSION} python3-osm-rovim-fos${RO_VERSION} python3-osm-rovim-opennebula${RO_VERSION}
-    # python3-osm-rosdn-floodlightof python3-osm-rosdn-odlof 
-
+ARG COMMON_VERSION
+
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y python3-osm-common${COMMON_VERSION} \
+    python3-osm-ro-plugin${RO_VERSION} python3-osm-ng-ro${RO_VERSION} \
+    python3-osm-rosdn-arista-cloudvision${RO_VERSION} python3-osm-rosdn-dpb${RO_VERSION} \
+    python3-osm-rosdn-dynpac${RO_VERSION} python3-osm-rosdn-floodlightof${RO_VERSION} \
+    python3-osm-rosdn-ietfl2vpn${RO_VERSION}  python3-osm-rosdn-juniper-contrail${RO_VERSION} \
+    python3-osm-rosdn-odlof${RO_VERSION} python3-osm-rosdn-onos-vpls${RO_VERSION} \
+    python3-osm-rosdn-onosof${RO_VERSION} \
+    python3-osm-rovim-aws${RO_VERSION} python3-osm-rovim-azure${RO_VERSION} \
+    python3-osm-rovim-fos${RO_VERSION} python3-osm-rovim-opennebula${RO_VERSION} \
+    python3-osm-rovim-openstack${RO_VERSION} python3-osm-rovim-openvim${RO_VERSION} \
+    python3-osm-rovim-vmware${RO_VERSION}
+
+# ensure right version is installed as pyhton3-ccryptography install an old version
+RUN python3 -m pip install --upgrade "cryptography>=2.5"
 
 VOLUME /var/log/osm
 
@@ -70,7 +75,24 @@ ENV RO_DB_NAME=mano_db
 ENV RO_DB_OVIM_NAME=mano_vim_db
 ENV OPENMANO_TENANT=osm
 
+# database
+ENV OSMRO_DATABASE_DRIVER mongo
+ENV OSMRO_DATABASE_URI mongodb://mongo:27017
+# ENV OSMRO_DATABASE_COMMONKEY  xxx
+# ENV OSMRO_DATABASE_USER  xxx
+# ENV OSMRO_DATABASE_PASSWORD  xxx
+
+# message
+ENV OSMRO_MESSAGE_DRIVER  kafka
+ENV OSMRO_MESSAGE_HOST    kafka
+ENV OSMRO_MESSAGE_PORT    9092
+
+# logs
+ENV OSMRO_LOG_LEVEL       INFO
+
 HEALTHCHECK --start-period=130s --interval=10s --timeout=5s --retries=12 \
-  CMD curl --silent --fail localhost:9090/openmano/tenants || exit 1
-CMD /usr/bin/RO-start.sh
+  CMD curl --silent --fail http://localhost:9090/ro || exit 1
+  # CMD curl --silent --fail localhost:9090/openmano/tenants || exit 1
+# CMD /usr/bin/RO-start.sh
+CMD python3 -m osm_ng_ro.ro_main