From 1eaac93df21e8e9985c9414bd31337979d7ad090 Mon Sep 17 00:00:00 2001 From: Matt McEuen Date: Mon, 26 Nov 2018 16:20:58 -0600 Subject: [PATCH] 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 --- .../developer/030-armada-bootstrap.sh | 3 + .../airskiff/manifests/airship.yaml | 65 ++++++++----------- 2 files changed, 29 insertions(+), 39 deletions(-) diff --git a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh index c7464e0f6..8177f3e17 100755 --- a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh +++ b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh @@ -17,9 +17,12 @@ set -xe +: "${INSTALL_PATH:="$(pwd)/../"}" + # Download latest Armada image and deploy Airship components docker run --rm --net host -p 8000:8000 --name armada \ -v ~/.kube/config:/armada/.kube/config \ -v "$(pwd)"/tools/deployment/airskiff/manifests/:/manifests \ + -v "${INSTALL_PATH}":/airship-components \ quay.io/airshipit/armada:latest \ apply /manifests/airship.yaml diff --git a/tools/deployment/airskiff/manifests/airship.yaml b/tools/deployment/airskiff/manifests/airship.yaml index a975ad75a..32d0870d3 100644 --- a/tools/deployment/airskiff/manifests/airship.yaml +++ b/tools/deployment/airskiff/manifests/airship.yaml @@ -13,10 +13,9 @@ data: release_group: airship-helm-toolkit values: {} source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: helm-toolkit - reference: master dependencies: [] --- schema: armada/Chart/v1 @@ -38,10 +37,9 @@ data: network: host_namespace: True source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: ingress - reference: master dependencies: - osh-helm-toolkit --- @@ -59,10 +57,9 @@ data: release_group: airship-ingress-ucp values: {} source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: ingress - reference: master dependencies: - osh-helm-toolkit --- @@ -82,10 +79,9 @@ data: storageclass: name: general source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: nfs-provisioner - reference: master dependencies: - osh-helm-toolkit --- @@ -106,10 +102,9 @@ data: replicas: server: 1 source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: mariadb - reference: master dependencies: - osh-helm-toolkit --- @@ -132,10 +127,9 @@ data: replicas: server: 1 source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: rabbitmq - reference: master dependencies: - osh-helm-toolkit --- @@ -153,10 +147,9 @@ data: release_group: airship-memcached values: {} source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: memcached - reference: master dependencies: - osh-helm-toolkit --- @@ -174,10 +167,9 @@ data: release_group: airship-keystone-ucp values: {} source: - type: git - location: https://git.openstack.org/openstack/openstack-helm.git + type: local + location: /airship-components/openstack-helm subpath: keystone - reference: master dependencies: - osh-helm-toolkit --- @@ -198,10 +190,9 @@ data: replicas: server: 1 source: - type: git - location: https://git.openstack.org/openstack/openstack-helm-infra.git + type: local + location: /airship-components/openstack-helm-infra subpath: postgresql - reference: master dependencies: - osh-helm-toolkit --- @@ -219,10 +210,9 @@ data: release_group: airship-barbican values: {} source: - type: git - location: https://git.openstack.org/openstack/openstack-helm.git + type: local + location: /airship-components/openstack-helm subpath: barbican - reference: master dependencies: - osh-helm-toolkit --- @@ -244,10 +234,9 @@ data: keystone_authtoken: timeout: null source: - type: git - location: https://git.openstack.org/openstack/airship-armada.git + type: local + location: /airship-components/airship-armada subpath: charts/armada - reference: master dependencies: - osh-helm-toolkit --- @@ -265,10 +254,9 @@ data: release_group: airship-deckhand values: {} source: - type: git - location: https://git.openstack.org/openstack/airship-deckhand.git + type: local + location: /airship-components/airship-deckhand subpath: charts/deckhand - reference: master dependencies: - osh-helm-toolkit --- @@ -309,10 +297,9 @@ data: promenade: service_type: armada source: - type: git - location: https://git.openstack.org/openstack/airship-shipyard.git + type: local + location: /airship-components/airship-shipyard subpath: charts/shipyard - reference: master dependencies: - osh-helm-toolkit ---