aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authorMunir Ahmad <munir.ahmad@bell.ca>2017-08-17 11:56:15 -0400
committerMunir Ahmad <munir.ahmad@bell.ca>2017-08-17 12:00:40 -0400
commit76610be9053a1baf9248c6fd51180d247b5ea773 (patch)
tree8c87c6dee4de1efc439e3d48b95e54f8f833d301 /kubernetes
parentaaf060dac3d302f94ce99e5c63002f046e4d3f0e (diff)
Revert aaf060dac3d302f94ce99e5c63002f046e4d3f0e
Issue-ID: OOM-145 This reverts commit aaf060dac3d302f94ce99e5c63002f046e4d3f0e. Change-Id: I0f04c394846d553b60b1c0c3a334f98c021d804e Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/config/pod-config-init.yaml2
-rw-r--r--kubernetes/mso/db-deployment.yaml2
-rwxr-xr-xkubernetes/oneclick/createAll.bash4
-rwxr-xr-xkubernetes/portal/portal-apps-deployment.yaml24
-rwxr-xr-xkubernetes/portal/portal-mariadb-deployment.yaml2
5 files changed, 17 insertions, 17 deletions
diff --git a/kubernetes/config/pod-config-init.yaml b/kubernetes/config/pod-config-init.yaml
index 6520c83aa5..372694ebe6 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/
+ path: /dockerdata-nfs/
restartPolicy: Never
diff --git a/kubernetes/mso/db-deployment.yaml b/kubernetes/mso/db-deployment.yaml
index d27fd52848..ff39c5b155 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/onapdemo/mso/mariadb/docker-entrypoint-initdb.d
+ path: /dockerdata-nfs/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 bb44100e65..5e5f2dc76e 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/onapdemo' volume mount paths
- find ../$2 -iname "*.yaml" -type f -exec sed -i -e 's/dockerdata\/[a-zA-Z0-9\\-]*\//dockerdata\/'"$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' {} \;
rm -f ../$2/*.yaml-e
}
diff --git a/kubernetes/portal/portal-apps-deployment.yaml b/kubernetes/portal/portal-apps-deployment.yaml
index 4932fc03aa..39f32caa47 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/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
- name: portal-openid-connect-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/openid-connect.properties
- name: portal-system-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
- name: portal-portal-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
- name: dbcapp-fusion-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
- name: dbcapp-system-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties
- name: dbcapp-portal-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties
- name: dbcapp-dbcapp-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties
- name: sdkapp-system-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
- name: sdkapp-portal-properties
hostPath:
- path: /dockerdata/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
+ path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
- name: portal-mariadb-onboarding-sql
hostPath:
- path: /dockerdata/onapdemo/portal/mariadb/Apps_Users_OnBoarding_Script.sql
+ path: /dockerdata-nfs/onapdemo/portal/mariadb/Apps_Users_OnBoarding_Script.sql
- name: portal-root
hostPath:
- path: /dockerdata/onapdemo/portal
+ path: /dockerdata-nfs/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 43629e8f50..f1dae14017 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/onapdemo/portal/mariadb/data
+ path: /dockerdata-nfs/onapdemo/portal/mariadb/data
imagePullSecrets:
- name: onap-docker-registry-key