From 16321fa1379cf06bf8ae4a47526b76f5a9882726 Mon Sep 17 00:00:00 2001 From: Bryan Strassner Date: Tue, 26 Jun 2018 15:55:10 -0500 Subject: [PATCH] Update chart to match SY on OSH-infra HTK The move to OSH-infra HTK causes some minor changes to the overrides of values in the Armada charts. This PS introduces those. Change-Id: I97f6518f639061b1b81e9f591ed82ae5b8aa31d9 --- .../software/charts/ucp/shipyard/shipyard.yaml | 7 ++++--- .../v1.0demo/software/config/versions.yaml | 17 +++++++++-------- .../software/charts/ucp/shipyard/shipyard.yaml | 7 ++++--- .../v1.0dev/software/config/versions.yaml | 17 +++++++++-------- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml index b245a848..19515ec2 100644 --- a/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml +++ b/deployment_files/global/v1.0demo/software/charts/ucp/shipyard/shipyard.yaml @@ -167,7 +167,7 @@ metadata: name: ucp_postgres_admin_password path: . - dest: - path: .values.endpoints.identity.auth.user.password + path: .values.endpoints.identity.auth.shipyard.password src: schema: deckhand/Passphrase/v1 name: ucp_shipyard_keystone_password @@ -249,8 +249,9 @@ data: flower: 1 scheduler: 1 labels: - node_selector_key: ucp-control-plane - node_selector_value: enabled + job: + node_selector_key: ucp-control-plane + node_selector_value: enabled network: shipyard: enable_node_port: true diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index 20f1a157..52e5cf54 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -274,14 +274,14 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 shipyard: type: git - location: https://github.com/openstack/airship-shipyard + location: https://git.openstack.org/openstack/airship-shipyard subpath: charts/shipyard - reference: 0c9152d62e43747f33da58b217320f783a5cca8b + reference: 66da23cb20c545bf82e7d1aec321edf9ebc06cac shipyard-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 tiller: type: git location: https://git.openstack.org/openstack/airship-armada @@ -460,16 +460,17 @@ data: drydock_db_init: docker.io/postgres:9.5 drydock_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/drydock:506e06623a5f1c11c0d34f2089851cc8381f06ae shipyard: - airflow: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b - shipyard: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b + airflow: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac + shipyard: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 shipyard_db_init: docker.io/postgres:9.5 - shipyard_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b + shipyard_db_sync: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac airflow_db_init: docker.io/postgres:9.5 - airflow_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b + airflow_db_sync: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata + image_repo_sync: docker.io/docker:17.07.0 maas: db_init: docker.io/postgres:9.5 db_sync: artifacts-aic.atlantafoundry.com/att-comdev/maas-region-controller:3e4849e132353f22378fa7d10838f3e0c2f0eef2 diff --git a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml index b245a848..19515ec2 100644 --- a/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml +++ b/deployment_files/global/v1.0dev/software/charts/ucp/shipyard/shipyard.yaml @@ -167,7 +167,7 @@ metadata: name: ucp_postgres_admin_password path: . - dest: - path: .values.endpoints.identity.auth.user.password + path: .values.endpoints.identity.auth.shipyard.password src: schema: deckhand/Passphrase/v1 name: ucp_shipyard_keystone_password @@ -249,8 +249,9 @@ data: flower: 1 scheduler: 1 labels: - node_selector_key: ucp-control-plane - node_selector_value: enabled + job: + node_selector_key: ucp-control-plane + node_selector_value: enabled network: shipyard: enable_node_port: true diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml index 63f3bd86..5eeca5c8 100644 --- a/deployment_files/global/v1.0dev/software/config/versions.yaml +++ b/deployment_files/global/v1.0dev/software/config/versions.yaml @@ -274,14 +274,14 @@ data: reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 shipyard: type: git - location: https://github.com/openstack/airship-shipyard + location: https://git.openstack.org/openstack/airship-shipyard subpath: charts/shipyard - reference: 0c9152d62e43747f33da58b217320f783a5cca8b + reference: 66da23cb20c545bf82e7d1aec321edf9ebc06cac shipyard-htk: type: git - location: https://git.openstack.org/openstack/openstack-helm + location: https://git.openstack.org/openstack/openstack-helm-infra subpath: helm-toolkit - reference: f902cd14fac7de4c4c9f7d019191268a6b4e9601 + reference: f402171e42356bc1e805782f1d7f090ce1f6ab17 tiller: type: git location: https://git.openstack.org/openstack/airship-armada @@ -338,16 +338,17 @@ data: drydock_db_init: docker.io/postgres:9.5 drydock_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/drydock:506e06623a5f1c11c0d34f2089851cc8381f06ae shipyard: - airflow: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b - shipyard: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b + airflow: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac + shipyard: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 shipyard_db_init: docker.io/postgres:9.5 - shipyard_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/shipyard:0c9152d62e43747f33da58b217320f783a5cca8b + shipyard_db_sync: quay.io/airshipit/shipyard:66da23cb20c545bf82e7d1aec321edf9ebc06cac airflow_db_init: docker.io/postgres:9.5 - airflow_db_sync: artifacts-aic.atlantafoundry.com/att-comdev/airflow:0c9152d62e43747f33da58b217320f783a5cca8b + airflow_db_sync: quay.io/airshipit/airflow:66da23cb20c545bf82e7d1aec321edf9ebc06cac ks_user: docker.io/openstackhelm/heat:ocata ks_service: docker.io/openstackhelm/heat:ocata ks_endpoints: docker.io/openstackhelm/heat:ocata + image_repo_sync: docker.io/docker:17.07.0 maas: db_init: docker.io/postgres:9.5 db_sync: artifacts-aic.atlantafoundry.com/att-comdev/maas-region-controller:3e4849e132353f22378fa7d10838f3e0c2f0eef2