airship
/
promenade
Code Issues Proposed changes

Fix: revert to openstack-helm/helm-toolkit 

openstack-helm-infra/helm-toolkit is not yet ready.  This:

* Removes references to openstack-helm-infra in examples and tests.
* Eliminates unneeded project tmp directory.

Change-Id: If2dfca60bea13f30124ddb82838ff0f4097c21be
This commit is contained in:
Mark Burnett 2017-11-02 10:11:07 -05:00
parent 9a5d70f30a
commit 4d7df8610a
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,7 +13,6 @@
/build
/conformance
/promenade.egg-info
/tmp
# Python artifacts
__pycache__

3
Makefile
View File

@ -14,7 +14,6 @@
HELM ?= helm
HELM_PIDFILE ?= $(abspath ./.helm-pid)
TMP_DIR ?= $(abspath ./tmp)
CHARTS := $(patsubst %/.,%,$(wildcard charts/*/.))
@ -35,7 +34,7 @@ $(CHARTS): helm-serve
.PHONY: helm-serve
helm-serve:
./tools/helm_tk.sh $(HELM) $(HELM_PIDFILE) $(TMP_DIR)
./tools/helm_tk.sh $(HELM) $(HELM_PIDFILE)
.PHONY: clean
clean:

2
examples/basic/armada-resources.yaml
View File

@ -80,7 +80,7 @@ data:
values: {}
source:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: master
dependencies: []

2
examples/complete/armada-resources.yaml
View File

@ -109,7 +109,7 @@ data:
values: {}
source:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: master
dependencies: []

2
tools/gate/config-templates/bootstrap-armada-config.yaml
View File

@ -96,7 +96,7 @@ data:
values: {}
source:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm
subpath: helm-toolkit
reference: master
dependencies: []

15
tools/helm_tk.sh
View File

@ -18,7 +18,7 @@ set -eux
HELM=${1}
HELM_PIDFILE=${2}
SERVE_DIR=${3}
SERVE_DIR=$(mktemp -d)
${HELM} init --client-only
@ -56,9 +56,12 @@ fi
${HELM} repo add local http://localhost:8879/charts
mkdir -p "${SERVE_DIR}"
cd "${SERVE_DIR}"
git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
cd openstack-helm-infra
{
cd "${SERVE_DIR}"
git clone --depth 1 https://git.openstack.org/openstack/openstack-helm.git || true
cd openstack-helm
make helm-toolkit
make helm-toolkit
}
rm -rf "${SERVE_DIR}"