Commit c09bd23f authored by pedrocjdpereira's avatar pedrocjdpereira Committed by garciadeblas
Browse files

Feature 10991: new environment variables OSMLCM_VCA_MAINPOSTRENDERERPATH and... 


Feature 10991: new environment variables OSMLCM_VCA_MAINPOSTRENDERERPATH and OSMLCM_VCA_PODLABELSPOSTRENDERERPATH

Change-Id: Ifd1632f546bcdebd985b33accc6d0bf592de68f9
Signed-off-by: default avatarPedro Pereira <pedrocjdpereira@av.it.pt>
parent 70461c5e

docker/LCM/Dockerfile

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ ENV OSMLCM_VCA_HELMPATH /usr/local/bin/helm3 
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



# helm

ENV OSMLCM_VCA_STABLEREPOURL https://charts.helm.sh/stable

# ENV OSMLCM_VCA_HELM_CA_CERTS <ca-cert>

installers/helm/osm/templates/lcm/lcm-configmap.yaml

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ data: 
  OSMLCM_STORAGE_COLLECTION: "files"

  OSMLCM_STORAGE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0"

  OSMLCM_GLOBAL_LOGLEVEL: {{ .Values.lcm.logLevel | default .Values.global.logLevel | default "INFO" }}

  OSMLCM_MAINPOSTRENDERERPATH: "{{ .Values.lcm.mainPostRenderer.path }}{{ .Values.lcm.mainPostRenderer.scriptName }}"

  OSMLCM_PODLABELSPOSTRENDERERPATH: "{{ .Values.lcm.podLabelsPostRenderer.path }}{{ .Values.lcm.podLabelsPostRenderer.scriptName }}"

{{- if .Values.global.behindHttpProxy -}}

{{- with .Values.global.httpProxy }}

  {{- . | toYaml | nindent 2 }}

installers/helm/osm/values.yaml

+6 −0
Original line number Diff line number Diff line
@@ -203,6 +203,12 @@ lcm: 
  # replicaCount: 1

  useOsmSecret: true

  # secretName: "lcm-secret"

  mainPostRenderer:

    scriptName: mainPostRenderer

    path: /app/N2VC/n2vc/post-renderer-scripts/mainPostRenderer/

  podLabelsPostRenderer:

    scriptName: podLabels

    path: /app/N2VC/n2vc/post-renderer-scripts/podLabels/

  config:

    OSMLCM_VCA_CLOUD: "lxd-cloud"

    OSMLCM_VCA_K8S_CLOUD: "k8scloud"