From edc898536f7fdc28f532dda7b69d8d120c364403 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Wed, 24 Jan 2018 15:25:08 -0500 Subject: [PATCH] Fix wrong host path for robot properties MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit https://gerrit.onap.org/r/#/c/28935/ changed the path where the vm_properties.py file is located. It also changed the persisted folder removing the support of persisting logs. This patch is reverting this. Change-Id: Id3ecfa5752e7e27ddfd00742277843ac3021aec8 Issue-ID: OOM-575 Signed-off-by: Alexis de Talhouët --- kubernetes/config/docker/init/config-init.sh | 4 ++-- .../init/src/config/robot/{ => eteshare}/config/vm_properties.py | 0 kubernetes/config/values.yaml | 2 +- kubernetes/robot/templates/robot-deployment.yaml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) rename kubernetes/config/docker/init/src/config/robot/{ => eteshare}/config/vm_properties.py (100%) diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh index c1eaf32ab1..9d8e5877ed 100755 --- a/kubernetes/config/docker/init/config-init.sh +++ b/kubernetes/config/docker/init/config-init.sh @@ -179,8 +179,8 @@ SED_CONFIG_STRINGS=( \ "s/OPENSTACK_ENCRYPTED_PASSWORD_HERE/${OPENSTACK_API_ENCRYPTED_KEY}/g" \ "s/VNF_OPENSTACK_OAM_NETWORK_ID_HERE/$OPENSTACK_OAM_NETWORK_ID/g" \ "s/VNF_OPENSTACK_PUBLIC_ID_HERE/$OPENSTACK_PUBLIC_NETWORK_ID/g" \ - "s/VNF_OPENSTACK_FLAVOR/$OPENSTACK_FLAVOR/g" \ - "s/VNF_OPENSTACK_IMAGE/$OPENSTACK_IMAGE/g" \ + "s/VNF_OPENSTACK_FLAVOR_HERE/$OPENSTACK_FLAVOR/g" \ + "s/VNF_OPENSTACK_IMAGE_HERE/$OPENSTACK_IMAGE/g" \ ) SED_CONFIG_STRING=$(concat_array "${SED_CONFIG_STRINGS[@]}") find $SED_CONFIG_PATHS -type f -exec sed -i -e "${SED_CONFIG_STRING}" {} \; diff --git a/kubernetes/config/docker/init/src/config/robot/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py similarity index 100% rename from kubernetes/config/docker/init/src/config/robot/config/vm_properties.py rename to kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py diff --git a/kubernetes/config/values.yaml b/kubernetes/config/values.yaml index 16e6d48946..a52d2953c1 100644 --- a/kubernetes/config/values.yaml +++ b/kubernetes/config/values.yaml @@ -3,5 +3,5 @@ nsPrefix: onap dockerSharePath: /dockerdata-nfs image: repository: oomk8s/config-init - tag: 1.1.8 + tag: 1.1.9 pullPolicy: Always diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml index 154abb48ed..c3b50b78d6 100644 --- a/kubernetes/robot/templates/robot-deployment.yaml +++ b/kubernetes/robot/templates/robot-deployment.yaml @@ -33,8 +33,8 @@ spec: readOnly: true - name: robot-resources-asdc-interface mountPath: /var/opt/OpenECOMP_ETE/robot/resources/asdc_interface.robot - - name: vm-properties - mountPath: /share/config/ + - name: robot-eteshare + mountPath: /share - name: lighttpd-authorization mountPath: /etc/lighttpd/authorization ports: @@ -51,9 +51,9 @@ spec: - name: robot-resources-asdc-interface hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/robot/resources/asdc_interface.robot - - name: vm-properties + - name: robot-eteshare hostPath: - path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/config + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/eteshare - name: lighttpd-authorization hostPath: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization -- 2.16.6