Change airskiff manifest to deploy local airship

The airskiff 005-make-airship.sh deployment script clones
the armada, shipyard, deckhand, and OSH projects locally with
the intention of deploying them.  However, the Armada static
chart documents (airship.yaml) were configured to pull them
from git during a deployment.

This change modifies the Armada charts to use the local clones.
This is helpful in situations where a developer is making local
changes to one of the Airship projects -- they can just rerun
the 030-armada-bootstrap.sh script to deploy their local changes
to the running cluster. Same goes for testing changes OSH charts
like barbican, mariadb etc that run in the undercloud deployed
by airskiff.

Change-Id: Ice6a64922d13c8aca277b48d2d5266ab1d06c0f3
This commit is contained in:
Matt McEuen 2018-11-26 16:20:58 -06:00
parent 7b49f9402e
commit 1eaac93df2
2 changed files with 29 additions and 39 deletions

View File

@ -17,9 +17,12 @@
set -xe set -xe
: "${INSTALL_PATH:="$(pwd)/../"}"
# Download latest Armada image and deploy Airship components # Download latest Armada image and deploy Airship components
docker run --rm --net host -p 8000:8000 --name armada \ docker run --rm --net host -p 8000:8000 --name armada \
-v ~/.kube/config:/armada/.kube/config \ -v ~/.kube/config:/armada/.kube/config \
-v "$(pwd)"/tools/deployment/airskiff/manifests/:/manifests \ -v "$(pwd)"/tools/deployment/airskiff/manifests/:/manifests \
-v "${INSTALL_PATH}":/airship-components \
quay.io/airshipit/armada:latest \ quay.io/airshipit/armada:latest \
apply /manifests/airship.yaml apply /manifests/airship.yaml

View File

@ -13,10 +13,9 @@ data:
release_group: airship-helm-toolkit release_group: airship-helm-toolkit
values: {} values: {}
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: helm-toolkit subpath: helm-toolkit
reference: master
dependencies: [] dependencies: []
--- ---
schema: armada/Chart/v1 schema: armada/Chart/v1
@ -38,10 +37,9 @@ data:
network: network:
host_namespace: True host_namespace: True
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: ingress subpath: ingress
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -59,10 +57,9 @@ data:
release_group: airship-ingress-ucp release_group: airship-ingress-ucp
values: {} values: {}
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: ingress subpath: ingress
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -82,10 +79,9 @@ data:
storageclass: storageclass:
name: general name: general
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: nfs-provisioner subpath: nfs-provisioner
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -106,10 +102,9 @@ data:
replicas: replicas:
server: 1 server: 1
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: mariadb subpath: mariadb
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -132,10 +127,9 @@ data:
replicas: replicas:
server: 1 server: 1
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: rabbitmq subpath: rabbitmq
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -153,10 +147,9 @@ data:
release_group: airship-memcached release_group: airship-memcached
values: {} values: {}
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: memcached subpath: memcached
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -174,10 +167,9 @@ data:
release_group: airship-keystone-ucp release_group: airship-keystone-ucp
values: {} values: {}
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm.git location: /airship-components/openstack-helm
subpath: keystone subpath: keystone
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -198,10 +190,9 @@ data:
replicas: replicas:
server: 1 server: 1
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm-infra.git location: /airship-components/openstack-helm-infra
subpath: postgresql subpath: postgresql
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -219,10 +210,9 @@ data:
release_group: airship-barbican release_group: airship-barbican
values: {} values: {}
source: source:
type: git type: local
location: https://git.openstack.org/openstack/openstack-helm.git location: /airship-components/openstack-helm
subpath: barbican subpath: barbican
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -244,10 +234,9 @@ data:
keystone_authtoken: keystone_authtoken:
timeout: null timeout: null
source: source:
type: git type: local
location: https://git.openstack.org/openstack/airship-armada.git location: /airship-components/airship-armada
subpath: charts/armada subpath: charts/armada
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -265,10 +254,9 @@ data:
release_group: airship-deckhand release_group: airship-deckhand
values: {} values: {}
source: source:
type: git type: local
location: https://git.openstack.org/openstack/airship-deckhand.git location: /airship-components/airship-deckhand
subpath: charts/deckhand subpath: charts/deckhand
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---
@ -309,10 +297,9 @@ data:
promenade: promenade:
service_type: armada service_type: armada
source: source:
type: git type: local
location: https://git.openstack.org/openstack/airship-shipyard.git location: /airship-components/airship-shipyard
subpath: charts/shipyard subpath: charts/shipyard
reference: master
dependencies: dependencies:
- osh-helm-toolkit - osh-helm-toolkit
--- ---