From edc898536f7fdc28f532dda7b69d8d120c364403 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Wed, 24 Jan 2018 15:25:08 -0500 Subject: Fix wrong host path for robot properties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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/config/vm_properties.py | 64 ---------------------- .../config/robot/eteshare/config/vm_properties.py | 64 ++++++++++++++++++++++ kubernetes/config/values.yaml | 2 +- kubernetes/robot/templates/robot-deployment.yaml | 8 +-- 5 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 kubernetes/config/docker/init/src/config/robot/config/vm_properties.py create mode 100644 kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py (limited to 'kubernetes') 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/config/vm_properties.py deleted file mode 100644 index 7fd5b2fbf2..0000000000 --- a/kubernetes/config/docker/init/src/config/robot/config/vm_properties.py +++ /dev/null @@ -1,64 +0,0 @@ -# File generated from /opt/config -# -GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.onap-aai" -GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" -GLOBAL_INJECTED_APPC_IP_ADDR = "sdnhost.onap-appc" -GLOBAL_INJECTED_ARTIFACTS_VERSION = "DEMO_ARTIFACTS_VERSION_HERE" -GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap-clamp" -GLOBAL_INJECTED_CLOUD_ENV = "openstack" -GLOBAL_INJECTED_DCAE_IP_ADDR = "DCAE_CONTROLLER_IP_HERE" -GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" -GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router" -GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "NEXUS_DOCKER_REPO_HERE" -GLOBAL_INJECTED_NEXUS_PASSWORD = "NEXUS_PASSWORD_HERE" -GLOBAL_INJECTED_NEXUS_REPO = "NEXUS_HTTP_REPO_HERE" -GLOBAL_INJECTED_NEXUS_USERNAME = "NEXUS_USERNAME_HERE" -GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.onap-msb" -GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE" -GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "OPENSTACK_TENANT_ID_HERE" -GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE" -GLOBAL_INJECTED_POLICY_IP_ADDR = "drools.onap-policy" -GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal" -GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE" -GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.onap-sdc" -GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc" -GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc" -GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc" -GLOBAL_INJECTED_SO_IP_ADDR = "mso.onap-mso" -GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.onap-vid" -GLOBAL_INJECTED_NETWORK = "VNF_OPENSTACK_OAM_NETWORK_ID_HERE" -GLOBAL_INJECTED_PUBLIC_NET_ID = "VNF_OPENSTACK_PUBLIC_ID_HERE" -GLOBAL_INJECTED_VM_FLAVOR = "VNF_OPENSTACK_FLAVOR_HERE" -GLOBAL_INJECTED_VM_IMAGE_NAME = "VNF_OPENSTACK_IMAGE_HERE" - -GLOBAL_INJECTED_PROPERTIES={ -"GLOBAL_INJECTED_VM_IMAGE_NAME" : "VNF_OPENSTACK_IMAGE_HERE", -"GLOBAL_INJECTED_VM_FLAVOR" : "VNF_OPENSTACK_FLAVOR_HERE", -"GLOBAL_INJECTED_NETWORK" : "VNF_OPENSTACK_OAM_NETWORK_ID_HERE", -"GLOBAL_INJECTED_PUBLIC_NET_ID" : "VNF_OPENSTACK_PUBLIC_ID_HERE", -"GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.onap-aai", -"GLOBAL_INJECTED_AAI2_IP_ADDR" : "N/A", -"GLOBAL_INJECTED_APPC_IP_ADDR" : "sdnhost.onap-appc", -"GLOBAL_INJECTED_ARTIFACTS_VERSION" : "DEMO_ARTIFACTS_VERSION_HERE", -"GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.onap-clamp", -"GLOBAL_INJECTED_CLOUD_ENV" : "openstack", -"GLOBAL_INJECTED_DCAE_IP_ADDR" : "DCAE_CONTROLLER_IP_HERE", -"GLOBAL_INJECTED_KEYSTONE" : "OPENSTACK_KEYSTONE_IP_HERE", -"GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.onap-message-router", -"GLOBAL_INJECTED_NEXUS_DOCKER_REPO" : "NEXUS_DOCKER_REPO_HERE", -"GLOBAL_INJECTED_NEXUS_PASSWORD" : "NEXUS_PASSWORD_HERE", -"GLOBAL_INJECTED_NEXUS_REPO" : "NEXUS_HTTP_REPO_HERE", -"GLOBAL_INJECTED_NEXUS_USERNAME" : "NEXUS_USERNAME_HERE", -"GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.onap-msb", -"GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "OPENSTACK_PASSWORD_HERE", -"GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "OPENSTACK_TENANT_ID_HERE", -"GLOBAL_INJECTED_OPENSTACK_USERNAME" : "OPENSTACK_USERNAME_HERE", -"GLOBAL_INJECTED_POLICY_IP_ADDR" : "drools.onap-policy", -"GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.onap-portal", -"GLOBAL_INJECTED_REGION" : "OPENSTACK_REGION_HERE", -"GLOBAL_INJECTED_SDC_IP_ADDR" : "sdc-be.onap-sdc", -"GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.onap-sdc", -"GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.onap-sdc", -"GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.onap-sdnc", -"GLOBAL_INJECTED_SO_IP_ADDR" : "mso.onap-mso", -"GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.onap-vid"} \ No newline at end of file diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py new file mode 100644 index 0000000000..7fd5b2fbf2 --- /dev/null +++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py @@ -0,0 +1,64 @@ +# File generated from /opt/config +# +GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.onap-aai" +GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" +GLOBAL_INJECTED_APPC_IP_ADDR = "sdnhost.onap-appc" +GLOBAL_INJECTED_ARTIFACTS_VERSION = "DEMO_ARTIFACTS_VERSION_HERE" +GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap-clamp" +GLOBAL_INJECTED_CLOUD_ENV = "openstack" +GLOBAL_INJECTED_DCAE_IP_ADDR = "DCAE_CONTROLLER_IP_HERE" +GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" +GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router" +GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "NEXUS_DOCKER_REPO_HERE" +GLOBAL_INJECTED_NEXUS_PASSWORD = "NEXUS_PASSWORD_HERE" +GLOBAL_INJECTED_NEXUS_REPO = "NEXUS_HTTP_REPO_HERE" +GLOBAL_INJECTED_NEXUS_USERNAME = "NEXUS_USERNAME_HERE" +GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.onap-msb" +GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE" +GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "OPENSTACK_TENANT_ID_HERE" +GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE" +GLOBAL_INJECTED_POLICY_IP_ADDR = "drools.onap-policy" +GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal" +GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE" +GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.onap-sdc" +GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc" +GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc" +GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc" +GLOBAL_INJECTED_SO_IP_ADDR = "mso.onap-mso" +GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.onap-vid" +GLOBAL_INJECTED_NETWORK = "VNF_OPENSTACK_OAM_NETWORK_ID_HERE" +GLOBAL_INJECTED_PUBLIC_NET_ID = "VNF_OPENSTACK_PUBLIC_ID_HERE" +GLOBAL_INJECTED_VM_FLAVOR = "VNF_OPENSTACK_FLAVOR_HERE" +GLOBAL_INJECTED_VM_IMAGE_NAME = "VNF_OPENSTACK_IMAGE_HERE" + +GLOBAL_INJECTED_PROPERTIES={ +"GLOBAL_INJECTED_VM_IMAGE_NAME" : "VNF_OPENSTACK_IMAGE_HERE", +"GLOBAL_INJECTED_VM_FLAVOR" : "VNF_OPENSTACK_FLAVOR_HERE", +"GLOBAL_INJECTED_NETWORK" : "VNF_OPENSTACK_OAM_NETWORK_ID_HERE", +"GLOBAL_INJECTED_PUBLIC_NET_ID" : "VNF_OPENSTACK_PUBLIC_ID_HERE", +"GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.onap-aai", +"GLOBAL_INJECTED_AAI2_IP_ADDR" : "N/A", +"GLOBAL_INJECTED_APPC_IP_ADDR" : "sdnhost.onap-appc", +"GLOBAL_INJECTED_ARTIFACTS_VERSION" : "DEMO_ARTIFACTS_VERSION_HERE", +"GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.onap-clamp", +"GLOBAL_INJECTED_CLOUD_ENV" : "openstack", +"GLOBAL_INJECTED_DCAE_IP_ADDR" : "DCAE_CONTROLLER_IP_HERE", +"GLOBAL_INJECTED_KEYSTONE" : "OPENSTACK_KEYSTONE_IP_HERE", +"GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.onap-message-router", +"GLOBAL_INJECTED_NEXUS_DOCKER_REPO" : "NEXUS_DOCKER_REPO_HERE", +"GLOBAL_INJECTED_NEXUS_PASSWORD" : "NEXUS_PASSWORD_HERE", +"GLOBAL_INJECTED_NEXUS_REPO" : "NEXUS_HTTP_REPO_HERE", +"GLOBAL_INJECTED_NEXUS_USERNAME" : "NEXUS_USERNAME_HERE", +"GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.onap-msb", +"GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "OPENSTACK_PASSWORD_HERE", +"GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "OPENSTACK_TENANT_ID_HERE", +"GLOBAL_INJECTED_OPENSTACK_USERNAME" : "OPENSTACK_USERNAME_HERE", +"GLOBAL_INJECTED_POLICY_IP_ADDR" : "drools.onap-policy", +"GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.onap-portal", +"GLOBAL_INJECTED_REGION" : "OPENSTACK_REGION_HERE", +"GLOBAL_INJECTED_SDC_IP_ADDR" : "sdc-be.onap-sdc", +"GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.onap-sdc", +"GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.onap-sdc", +"GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.onap-sdnc", +"GLOBAL_INJECTED_SO_IP_ADDR" : "mso.onap-mso", +"GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.onap-vid"} \ No newline at end of file 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 -- cgit 1.2.3-korg