Fix wrong host path for robot properties

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 <adetalhouet89@gmail.com>

diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh
index c1eaf32..9d8e587 100755 (executable)
--- 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 16e6d48..a52d295 100644 (file)
--- 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 154abb4..c3b50b7 100644 (file)
--- 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