openstack/openstack-helm
Code Issues Proposed changes

Merge "Fix wrong chart name and env-variable's name in deployment-script"

Browse Source
This commit is contained in:
Zuul 2019-01-30 03:09:28 +00:00 committed by Gerrit Code Review
commit c863bb0cec
2 changed files with 3 additions and 3 deletions
tools/deployment/developer
ceph
110-ceph-radosgateway.sh
common
030-ingress.sh

4
tools/deployment/developer/ceph/110-ceph-radosgateway.sh

@ -17,10 +17,10 @@
set -xe set -xe
#NOTE: Lint and package chart #NOTE: Lint and package chart
make ceph : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} ceph-rgw
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
tee /tmp/radosgw-openstack.yaml <<EOF tee /tmp/radosgw-openstack.yaml <<EOF
endpoints: endpoints:

2
tools/deployment/developer/common/030-ingress.sh

@ -110,7 +110,7 @@ helm status ingress-openstack
helm upgrade --install ingress-ceph ${OSH_INFRA_PATH}/ingress \ helm upgrade --install ingress-ceph ${OSH_INFRA_PATH}/ingress \
--namespace=ceph \ --namespace=ceph \
${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS} \
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK} ${OSH_EXTRA_HELM_ARGS_INGRESS_CEPH}
#NOTE: Wait for deploy #NOTE: Wait for deploy
./tools/deployment/common/wait-for-pods.sh ceph ./tools/deployment/common/wait-for-pods.sh ceph