diff --git a/tools/deployment/component/aodh/aodh.sh b/tools/deployment/component/aodh/aodh.sh index 30101886c5..122f2228b4 100755 --- a/tools/deployment/component/aodh/aodh.sh +++ b/tools/deployment/component/aodh/aodh.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_AODH:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c aodh ${FEATURES})"} #NOTE: Wait for deploy diff --git a/tools/deployment/component/barbican/barbican.sh b/tools/deployment/component/barbican/barbican.sh index 66ac7ac333..fbfd13f04e 100755 --- a/tools/deployment/component/barbican/barbican.sh +++ b/tools/deployment/component/barbican/barbican.sh @@ -16,7 +16,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_BARBICAN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c barbican ${FEATURES})"} : ${RUN_HELM_TESTS:="yes"} diff --git a/tools/deployment/component/ceilometer/ceilometer.sh b/tools/deployment/component/ceilometer/ceilometer.sh index 29d2afb593..91fb540cc1 100755 --- a/tools/deployment/component/ceilometer/ceilometer.sh +++ b/tools/deployment/component/ceilometer/ceilometer.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_CEILOMETER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c ceilometer ${FEATURES})"} #NOTE: Wait for deploy diff --git a/tools/deployment/component/cinder/cinder.sh b/tools/deployment/component/cinder/cinder.sh index a6eaccdde9..cd06dabe40 100755 --- a/tools/deployment/component/cinder/cinder.sh +++ b/tools/deployment/component/cinder/cinder.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_CINDER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c cinder ${FEATURES})"} : ${RUN_HELM_TESTS:="yes"} diff --git a/tools/deployment/component/common/openstack.sh b/tools/deployment/component/common/openstack.sh index cd3fc7915a..d0f58065ec 100755 --- a/tools/deployment/component/common/openstack.sh +++ b/tools/deployment/component/common/openstack.sh @@ -16,7 +16,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} export OS_CLOUD=openstack_helm : "${RUN_HELM_TESTS:="no"}" : "${CEPH_ENABLED:="false"}" diff --git a/tools/deployment/component/compute-kit/compute-kit.sh b/tools/deployment/component/compute-kit/compute-kit.sh index e75dec3dcb..571999f016 100755 --- a/tools/deployment/component/compute-kit/compute-kit.sh +++ b/tools/deployment/component/compute-kit/compute-kit.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_PLACEMENT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c placement ${FEATURES})"} : ${OSH_EXTRA_HELM_ARGS_NOVA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c nova ${FEATURES})"} : ${OSH_EXTRA_HELM_ARGS_NEUTRON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c neutron ${FEATURES})"} diff --git a/tools/deployment/component/glance/glance.sh b/tools/deployment/component/glance/glance.sh index fef03d94e2..6af7184d36 100755 --- a/tools/deployment/component/glance/glance.sh +++ b/tools/deployment/component/glance/glance.sh @@ -16,7 +16,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_GLANCE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c glance ${FEATURES})"} : ${RUN_HELM_TESTS:="yes"} : ${GLANCE_BACKEND:="pvc"} diff --git a/tools/deployment/component/heat/heat.sh b/tools/deployment/component/heat/heat.sh index 9a03d33335..4e430af896 100755 --- a/tools/deployment/component/heat/heat.sh +++ b/tools/deployment/component/heat/heat.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_HEAT:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c heat ${FEATURES})"} #NOTE: Deploy command diff --git a/tools/deployment/component/horizon/horizon.sh b/tools/deployment/component/horizon/horizon.sh index e3101c6eb1..2817846e65 100755 --- a/tools/deployment/component/horizon/horizon.sh +++ b/tools/deployment/component/horizon/horizon.sh @@ -16,7 +16,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_HORIZON:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c horizon ${FEATURES})"} : ${RUN_HELM_TESTS:="yes"} diff --git a/tools/deployment/component/keystone/keystone.sh b/tools/deployment/component/keystone/keystone.sh index 3c7523ba9b..6b6ed9e4a4 100755 --- a/tools/deployment/component/keystone/keystone.sh +++ b/tools/deployment/component/keystone/keystone.sh @@ -16,7 +16,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_KEYSTONE:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c keystone ${FEATURES})"} : ${RUN_HELM_TESTS:="no"} diff --git a/tools/deployment/component/magnum/magnum.sh b/tools/deployment/component/magnum/magnum.sh index d44dd2171b..ee87041fe1 100755 --- a/tools/deployment/component/magnum/magnum.sh +++ b/tools/deployment/component/magnum/magnum.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_MAGNUM:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c magnum ${FEATURES})"} : ${RUN_HELM_TESTS:="yes"} diff --git a/tools/deployment/component/manila/manila.sh b/tools/deployment/component/manila/manila.sh index 4d2b5efc15..72d2f00e85 100755 --- a/tools/deployment/component/manila/manila.sh +++ b/tools/deployment/component/manila/manila.sh @@ -16,7 +16,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_MANILA:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c manila ${FEATURES})"} : ${RUN_HELM_TESTS:="no"} diff --git a/tools/deployment/component/mistral/mistral.sh b/tools/deployment/component/mistral/mistral.sh index 028ea88cf0..6ea6450afe 100755 --- a/tools/deployment/component/mistral/mistral.sh +++ b/tools/deployment/component/mistral/mistral.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_MISTRAL:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c mistral ${FEATURES})"} : ${RUN_HELM_TESTS:="yes"} diff --git a/tools/deployment/component/senlin/senlin.sh b/tools/deployment/component/senlin/senlin.sh index 5b305eb303..745937499b 100755 --- a/tools/deployment/component/senlin/senlin.sh +++ b/tools/deployment/component/senlin/senlin.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_SENLIN:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c senlin ${FEATURES})"} : ${RUN_HELM_TESTS:="yes"} diff --git a/tools/deployment/component/tacker/tacker.sh b/tools/deployment/component/tacker/tacker.sh index 0adf77f5b3..fbb3c3cf5f 100755 --- a/tools/deployment/component/tacker/tacker.sh +++ b/tools/deployment/component/tacker/tacker.sh @@ -15,7 +15,7 @@ set -xe #NOTE: Define variables : ${OSH_HELM_REPO:="../openstack-helm"} -: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values"} +: ${OSH_VALUES_OVERRIDES_PATH:="../openstack-helm/values_overrides"} : ${OSH_EXTRA_HELM_ARGS_TACKER:="$(helm osh get-values-overrides ${DOWNLOAD_OVERRIDES:-} -p ${OSH_VALUES_OVERRIDES_PATH} -c tacker ${FEATURES})"} : ${RUN_HELM_TESTS:="no"}