openstack/openstack-helm
Code Issues Proposed changes

Gate: Fix make command for osh-infra charts

Browse Source 
This updates the make command for the osh-infra charts in the
deployment scripts to account for the charts residing in
openstack-helm-infra instead of the openstack-helm working
directory

Change-Id: I9f492e586f69b0caf908366a9cae2b55da0d4cfc
This commit is contained in:
Steve Wilkerson 2018-09-04 16:23:54 -05:00
parent 946cc3fa97
commit 75f6c9bb1b
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/deployment/baremetal/020-ingress.sh
View File

@ -17,10 +17,10 @@
set -xe set -xe
#NOTE: Lint and package chart #NOTE: Lint and package chart
make ingress : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} ingress
#NOTE: Deploy global ingress #NOTE: Deploy global ingress
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
helm install ${OSH_INFRA_PATH}/ingress \ helm install ${OSH_INFRA_PATH}/ingress \
--namespace=kube-system \ --namespace=kube-system \
--name=ingress-kube-system \ --name=ingress-kube-system \

4
tools/deployment/common/memcached.sh
View File

@ -17,10 +17,10 @@
set -xe set -xe
#NOTE: Lint and package chart #NOTE: Lint and package chart
make memcached : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} memcached
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install memcached ${OSH_INFRA_PATH}/memcached \ helm upgrade --install memcached ${OSH_INFRA_PATH}/memcached \
--namespace=openstack \ --namespace=openstack \

5
tools/deployment/developer/ceph/040-ceph.sh
View File

@ -17,12 +17,13 @@
set -xe set -xe
#NOTE: Lint and package chart #NOTE: Lint and package chart
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do
make "${CHART}" make -C ${OSH_INFRA_PATH} "${CHART}"
done done
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
[ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt [ -s /tmp/ceph-fs-uuid.txt ] || uuidgen > /tmp/ceph-fs-uuid.txt
CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)" CEPH_FS_ID="$(cat /tmp/ceph-fs-uuid.txt)"

4
tools/deployment/developer/ceph/045-ceph-ns-activate.sh
View File

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

3
tools/deployment/developer/common/030-ingress.sh
View File

@ -17,7 +17,8 @@
set -xe set -xe
#NOTE: Lint and package chart #NOTE: Lint and package chart
make ingress : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} ingress
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_INFRA_PATH:="../openstack-helm-infra"}

4
tools/deployment/developer/common/060-rabbitmq.sh
View File

@ -17,10 +17,10 @@
set -xe set -xe
#NOTE: Lint and package chart #NOTE: Lint and package chart
make rabbitmq : ${OSH_INFRA_PATH:="../openstack-helm-infra"}
make -C ${OSH_INFRA_PATH} rabbitmq
#NOTE: Deploy command #NOTE: Deploy command
: ${OSH_INFRA_PATH:="../openstack-helm-infra"}
: ${OSH_EXTRA_HELM_ARGS:=""} : ${OSH_EXTRA_HELM_ARGS:=""}
helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \ helm upgrade --install rabbitmq ${OSH_INFRA_PATH}/rabbitmq \
--namespace=openstack \ --namespace=openstack \