From b913cb6443dfcd8196a62daf3a4affb5718ec83b Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Tue, 4 Sep 2018 16:26:44 -0500 Subject: [PATCH] Libvirt: Fix make command in deployment scripts This updates the make command for the libvirt chart to account for the libvirt chart residing in openstack-helm-infra instead of the openstack-helm project directory Change-Id: I1cb37e7c094e31ca93f1fa5d1ff531645308a563 --- tools/deployment/baremetal/005-setup-nodes.sh | 1 + tools/deployment/developer/ceph/150-libvirt.sh | 4 ++-- tools/deployment/developer/nfs/150-libvirt.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh index a2b8406146..464bdefd6a 100755 --- a/tools/deployment/baremetal/005-setup-nodes.sh +++ b/tools/deployment/baremetal/005-setup-nodes.sh @@ -28,6 +28,7 @@ make all #NOTE: Deploy libvirt with vbmc then define domains to use as baremetal nodes : ${OSH_INFRA_PATH:="../openstack-helm-infra"} +make -C ${OSH_INFRA_PATH} libvirt helm install ${OSH_INFRA_PATH}/libvirt \ --namespace=libvirt \ --name=libvirt \ diff --git a/tools/deployment/developer/ceph/150-libvirt.sh b/tools/deployment/developer/ceph/150-libvirt.sh index 71514dd884..952dadd8e8 100755 --- a/tools/deployment/developer/ceph/150-libvirt.sh +++ b/tools/deployment/developer/ceph/150-libvirt.sh @@ -16,10 +16,10 @@ set -xe #NOTE: Lint and package chart -make libvirt +: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +make -C ${OSH_INFRA_PATH} libvirt #NOTE: Deploy command -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_EXTRA_HELM_ARGS:=""} helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \ --namespace=openstack \ diff --git a/tools/deployment/developer/nfs/150-libvirt.sh b/tools/deployment/developer/nfs/150-libvirt.sh index c3420ae4e3..d746b7f496 100755 --- a/tools/deployment/developer/nfs/150-libvirt.sh +++ b/tools/deployment/developer/nfs/150-libvirt.sh @@ -16,10 +16,10 @@ set -xe #NOTE: Lint and package chart -make libvirt +: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +make -C ${OSH_INFRA_PATH} libvirt #NOTE: Deploy command -: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_EXTRA_HELM_ARGS:=""} helm upgrade --install libvirt ${OSH_INFRA_PATH}/libvirt \ --namespace=openstack \