Feature 7184 New Generation RO enhancemnt
New module vim_admin:
- check and load unattending ro_tasks
- check for vim updates and deletion in order to re-load it
- check vim_connectivity at creation edition
- Injection of ssh keys, retry if fails
- allow non load filesystem, because it is used only for cloud-init, but
it can be provided as text by LCM
- load sdn and wim targets
- sdn connectivity
- set network type 'data' when there are SRIOV or PT interfaces
Change-Id: I67147d1d500d60f0b2be1de214c97b1905168c8e
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/Dockerfile-local b/Dockerfile-local
index 88fdfc8..b99a090 100644
--- a/Dockerfile-local
+++ b/Dockerfile-local
@@ -50,6 +50,7 @@
python3 -m pip install -e /root/RO/RO-plugin && \
python3 -m pip install -e /root/RO/RO && \
python3 -m pip install -e /root/RO/RO-client && \
+ python3 -m pip install -e /root/RO/NG-RO && \
python3 -m pip install -e /root/RO/RO-VIM-vmware && \
python3 -m pip install -e /root/RO/RO-VIM-openstack && \
python3 -m pip install -e /root/RO/RO-VIM-openvim && \
@@ -68,42 +69,27 @@
apt-get clean && \
rm -rf /var/lib/apt/lists/*
-VOLUME /var/log/osm
-
EXPOSE 9090
-# Two mysql databases are needed (DB and DB_OVIM). Can be hosted on same or separated containers
-# These ENV must be provided
-# RO_DB_HOST: host of the main
-# RO_DB_OVIM_HOST: ... if empty RO_DB_HOST is assumed
-# RO_DB_ROOT_PASSWORD: this has to be provided first time for creating database. It will create and init only if empty!
-# RO_DB_OVIM_ROOT_PASSWORD: ... if empty RO_DB_ROOT_PASSWORD is assumed
-# RO_DB_USER: default value 'mano'
-# RO_DB_OVIM_USER: default value 'mano'
-# RO_DB_PASSWORD: default value 'manopw'
-# RO_DB_OVIM_PASSWORD: default value 'manopw'
-# RO_DB_PORT: default value '3306'
-# RO_DB_OVIM_PORT: default value '3306'
-# RO_DB_NAME: default value 'mano_db'
-# RO_DB_OVIM_NAME: default value 'mano_vim_db'
-# RO_LOG_FILE: default log to stderr if not defined
+ENV OSMRO_NG True
-ENV RO_DB_HOST="" \
- RO_DB_OVIM_HOST="" \
- RO_DB_ROOT_PASSWORD="" \
- RO_DB_OVIM_ROOT_PASSWORD="" \
- RO_DB_USER=mano \
- RO_DB_OVIM_USER=mano \
- RO_DB_PASSWORD=manopw \
- RO_DB_OVIM_PASSWORD=manopw \
- RO_DB_PORT=3306 \
- RO_DB_OVIM_PORT=3306 \
- RO_DB_NAME=mano_db \
- RO_DB_OVIM_NAME=mano_vim_db \
- OPENMANO_TENANT=osm \
- RO_LOG_LEVEL=DEBUG
+# 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
-CMD RO-start.sh
+# message
+ENV OSMRO_MESSAGE_DRIVER kafka
+ENV OSMRO_MESSAGE_HOST kafka
+ENV OSMRO_MESSAGE_PORT 9092
+
+# logs
+ENV OSMRO_LOG_LEVEL DEBUG
+
+CMD python3 -m osm_ng_ro.ro_main
# HEALTHCHECK --start-period=30s --interval=10s --timeout=5s --retries=12 \
-# CMD curl --silent --fail localhost:9090/openmano/tenants || exit 1
+# CMD curl --silent --fail http://localhost:9090/ro || exit 1
+