summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2018-01-24 15:25:08 -0500
committerAlexis de Talhouët <adetalhouet89@gmail.com>2018-01-24 15:58:37 -0500
commitedc898536f7fdc28f532dda7b69d8d120c364403 (patch)
tree252261eadd8224db4b4c8e003a4e3f6f5f07ed13
parent934e3c77d927f41245c3bc71b1c8cee763d38350 (diff)
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>
-rwxr-xr-xkubernetes/config/docker/init/config-init.sh4
-rw-r--r--kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py (renamed from kubernetes/config/docker/init/src/config/robot/config/vm_properties.py)0
-rw-r--r--kubernetes/config/values.yaml2
-rw-r--r--kubernetes/robot/templates/robot-deployment.yaml8
4 files changed, 7 insertions, 7 deletions
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
index 7fd5b2fbf2..7fd5b2fbf2 100644
--- 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
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