airship
/
armada
Code Issues Proposed changes

Update HTK Path - OSH Infra 

Updated configurations to point to openstack-helm-infra
for reference to helm-toolkit as helm-toolkit has been
removed from the openstack-helm repo [0]

[0] https://review.openstack.org/#/c/558065/

Change-Id: Ia7f4da6beb5df5a98a1c35e66090d82960b00a34
This commit is contained in:
Anthony Lin 2018-05-16 04:35:41 +00:00
parent 8d1521e96c
commit c973720c07
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -111,7 +111,7 @@ clean:
# testing checks
.PHONY: tests
tests: check-tox helm_lint
tests: check-tox
tox
.PHONY: test-all

2
armada/tests/unit/resources/keystone-manifest.yaml
View File

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

2
armada/tests/unit/resources/valid_armada_document.yaml
View File

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

2
armada/tests/unit/utils/test_validate.py
View File

@ -185,7 +185,7 @@ data:
source:
reference: master
subpath: helm-toolkit
location: https://git.openstack.org/openstack/openstack-helm
location: https://git.openstack.org/openstack/openstack-helm-infra
type: git
namespace: helm-toolkit
upgrade:

2
examples/keystone-manifest.yaml
View File

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

2
examples/tar_example.yaml
View File

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

6
tools/helm_tk.sh
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Script to setup helm-toolkit and helm dep up the shipyard chart
# Script to setup helm-toolkit and helm dep up the armada chart
#
HELM=$1
@ -44,8 +44,8 @@ function helm_serve {
mkdir -p build
cd build
git clone --depth 1 https://git.openstack.org/openstack/openstack-helm.git || true
cd openstack-helm
git clone --depth 1 https://git.openstack.org/openstack/openstack-helm-infra.git || true
cd openstack-helm-infra
git pull
helm_serve
make charts