From aaf060dac3d302f94ce99e5c63002f046e4d3f0e Mon Sep 17 00:00:00 2001 From: Munir Ahmad Date: Thu, 17 Aug 2017 08:02:26 -0400 Subject: update dir path from dockerdata-nfs to dockerdata issue-id: OOM-145 Change-Id: I3f16fc32188118901612e1b93ec707fc1d513680 Signed-off-by: Munir Ahmad --- kubernetes/config/pod-config-init.yaml | 2 +- kubernetes/mso/db-deployment.yaml | 2 +- kubernetes/oneclick/createAll.bash | 4 ++-- kubernetes/portal/portal-apps-deployment.yaml | 24 ++++++++++++------------ kubernetes/portal/portal-mariadb-deployment.yaml | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kubernetes/config/pod-config-init.yaml b/kubernetes/config/pod-config-init.yaml index 372694ebe6..6520c83aa5 100644 --- a/kubernetes/config/pod-config-init.yaml +++ b/kubernetes/config/pod-config-init.yaml @@ -18,5 +18,5 @@ spec: volumes: - name: config-init-root hostPath: - path: /dockerdata-nfs/ + path: /dockerdata/ restartPolicy: Never diff --git a/kubernetes/mso/db-deployment.yaml b/kubernetes/mso/db-deployment.yaml index ff39c5b155..d27fd52848 100644 --- a/kubernetes/mso/db-deployment.yaml +++ b/kubernetes/mso/db-deployment.yaml @@ -49,6 +49,6 @@ spec: path: /dockerdata/onapdemo/mso/mariadb/mysql - name: mso-mariadb-docker-entrypoint-initdb hostPath: - path: /dockerdata-nfs/onapdemo/mso/mariadb/docker-entrypoint-initdb.d + path: /dockerdata/onapdemo/mso/mariadb/docker-entrypoint-initdb.d imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash index 5e5f2dc76e..bb44100e65 100755 --- a/kubernetes/oneclick/createAll.bash +++ b/kubernetes/oneclick/createAll.bash @@ -47,8 +47,8 @@ configure_app() { # user stories (ie. OOM-51 to OOM-53) find ../$2 -type f -exec sed -i -template "s/onap-/$1-/g" {} \; - # replace the default '/dockerdata-nfs/onapdemo' volume mount paths - find ../$2 -iname "*.yaml" -type f -exec sed -i -e 's/dockerdata-nfs\/[a-zA-Z0-9\\-]*\//dockerdata-nfs\/'"$1"'\//g' {} \; + # replace the default '/dockerdata/onapdemo' volume mount paths + find ../$2 -iname "*.yaml" -type f -exec sed -i -e 's/dockerdata\/[a-zA-Z0-9\\-]*\//dockerdata\/'"$1"'\//g' {} \; rm -f ../$2/*.yaml-e } diff --git a/kubernetes/portal/portal-apps-deployment.yaml b/kubernetes/portal/portal-apps-deployment.yaml index 39f32caa47..4932fc03aa 100755 --- a/kubernetes/portal/portal-apps-deployment.yaml +++ b/kubernetes/portal/portal-apps-deployment.yaml @@ -96,39 +96,39 @@ spec: volumes: - name: portal-fusion-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties - name: portal-openid-connect-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties - name: portal-system-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties - name: portal-portal-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties - name: dbcapp-fusion-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties - name: dbcapp-system-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties - name: dbcapp-portal-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties - name: dbcapp-dbcapp-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties - name: sdkapp-system-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties - name: sdkapp-portal-properties hostPath: - path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties + path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties - name: portal-mariadb-onboarding-sql hostPath: - path: /dockerdata-nfs/onapdemo/portal/mariadb/Apps_Users_OnBoarding_Script.sql + path: /dockerdata/onapdemo/portal/mariadb/Apps_Users_OnBoarding_Script.sql - name: portal-root hostPath: - path: /dockerdata-nfs/onapdemo/portal + path: /dockerdata/onapdemo/portal imagePullSecrets: - name: onap-docker-registry-key diff --git a/kubernetes/portal/portal-mariadb-deployment.yaml b/kubernetes/portal/portal-mariadb-deployment.yaml index f1dae14017..43629e8f50 100755 --- a/kubernetes/portal/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/portal-mariadb-deployment.yaml @@ -34,6 +34,6 @@ spec: volumes: - name: portal-mariadb-data hostPath: - path: /dockerdata-nfs/onapdemo/portal/mariadb/data + path: /dockerdata/onapdemo/portal/mariadb/data imagePullSecrets: - name: onap-docker-registry-key -- cgit 1.2.3-korg