Update LCM Dockerfile to remove N2VC dependence

Change-Id: Ia638d4c3b8730d05ec8f9e2c63b3ad545ea05934
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index bc17b7e..97ebd09 100644 (file)
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -54,20 +54,15 @@ RUN curl https://get.helm.sh/helm-v3.15.1-linux-amd64.tar.gz --output helm-v3.15
 
 ARG PYTHON3_OSM_COMMON_URL
 ARG PYTHON3_OSM_LCM_URL
-ARG PYTHON3_N2VC_URL
 
 RUN curl $PYTHON3_OSM_COMMON_URL -o osm_common.deb
 RUN dpkg -i ./osm_common.deb
 
-RUN curl $PYTHON3_N2VC_URL -o osm_n2vc.deb
-RUN dpkg -i ./osm_n2vc.deb
-
 RUN curl $PYTHON3_OSM_LCM_URL -o osm_lcm.deb
 RUN dpkg -i ./osm_lcm.deb
 
 RUN pip3 install \
     -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
-    -r /usr/lib/python3/dist-packages/n2vc/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_lcm/requirements.txt
 
 #######################################################################################
@@ -160,9 +155,9 @@ ENV OSMLCM_VCA_KUBECTLPATH /usr/bin/kubectl
 ENV OSMLCM_VCA_JUJUPATH    /usr/local/bin/juju
 
 # post-renderers
-ENV OSMLCM_MAINPOSTRENDERERPATH    /app/N2VC/n2vc/post-renderer-scripts/mainPostRenderer/mainPostRenderer
-ENV OSMLCM_PODLABELSPOSTRENDERERPATH    /app/N2VC/n2vc/post-renderer-scripts/podLabels/podLabels
-ENV OSMLCM_NODESELECTORPOSTRENDERERPATH    /app/N2VC/n2vc/post-renderer-scripts/nodeSelector/nodeSelector
+ENV OSMLCM_MAINPOSTRENDERERPATH    /app/osm_lcm/n2vc/post-renderer-scripts/mainPostRenderer/mainPostRenderer
+ENV OSMLCM_PODLABELSPOSTRENDERERPATH    /app/osm_lcm/n2vc/post-renderer-scripts/podLabels/podLabels
+ENV OSMLCM_NODESELECTORPOSTRENDERERPATH    /app/osm_lcm/n2vc/post-renderer-scripts/nodeSelector/nodeSelector
 
 # helm
 ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable

diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml
index 24be083..1a02c5a 100644 (file)
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -236,13 +236,13 @@ lcm:
   # secretName: "lcm-secret"
   mainPostRenderer:
     scriptName: mainPostRenderer
-    path: /usr/lib/python3/dist-packages/n2vc/post-renderer-scripts/mainPostRenderer/
+    path: /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/mainPostRenderer/
   podLabelsPostRenderer:
     scriptName: podLabels
-    path: /usr/lib/python3/dist-packages/n2vc/post-renderer-scripts/podLabels/
+    path: /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/podLabels/
   nodeSelectorPostRenderer:
     scriptName: nodeSelector
-    path: /usr/lib/python3/dist-packages/n2vc/post-renderer-scripts/nodeSelector/
+    path: /usr/lib/python3/dist-packages/osm_lcm/n2vc/post-renderer-scripts/nodeSelector/
   config:
     OSMLCM_VCA_CLOUD: "lxd-cloud"
     OSMLCM_VCA_K8S_CLOUD: "k8scloud"