diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile index bc17b7e6631d36d38f01953019fb9b8f29960ec7..97ebd09b930962e150406e2e222c91340c4199ee 100644 --- 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 24be083d4a0ad22083bb61c7cc86f3a8ac97c6ac..1a02c5a6182914748a441334bfb3b446c756960c 100644 --- 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"