summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Volkov <av903u@att.com>2018-10-02 07:33:20 -0700
committerAndrey Volkov <av903u@att.com>2018-10-08 12:02:52 -0700
commitfa01d6c2ab0f46567a24f79a6b8cddb2b25e654a (patch)
tree5f1b3bf1ea51009352d10b6ee34ef498a4ba5abf
parentaf17b1d32c8b3513d7d2ad538c122a16d7b4b548 (diff)
Bump Shipyard version
Shipyard references are updated for v1.0demo, v1.0dev. HTK for shipyard reference is updated to support release_uuid, see Iceedba457a03387f6fc44eb763a00fd57f9d84a5. Change-Id: Ib467209c93e33e951bf73dfbdd619a7381d536f5
Notes
Notes (review): Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+2: Matt McEuen <matt.mceuen@att.com> Workflow+1: Matt McEuen <matt.mceuen@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 09 Oct 2018 22:18:37 +0000 Reviewed-on: https://review.openstack.org/607203 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml12
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml12
2 files changed, 12 insertions, 12 deletions
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 69e82dc..da3c482 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -274,12 +274,12 @@ data:
274 type: git 274 type: git
275 location: https://git.openstack.org/openstack/airship-shipyard 275 location: https://git.openstack.org/openstack/airship-shipyard
276 subpath: charts/shipyard 276 subpath: charts/shipyard
277 reference: 188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 277 reference: 0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
278 shipyard-htk: 278 shipyard-htk:
279 type: git 279 type: git
280 location: https://git.openstack.org/openstack/openstack-helm-infra 280 location: https://git.openstack.org/openstack/openstack-helm-infra
281 subpath: helm-toolkit 281 subpath: helm-toolkit
282 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 282 reference: bb3ff98d53c38a2ba70f506a8b6dc36207baa207
283 tiller: 283 tiller:
284 type: git 284 type: git
285 location: https://git.openstack.org/openstack/airship-armada 285 location: https://git.openstack.org/openstack/airship-armada
@@ -490,13 +490,13 @@ data:
490 drydock_db_init: docker.io/postgres:9.5 490 drydock_db_init: docker.io/postgres:9.5
491 drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 491 drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
492 shipyard: 492 shipyard:
493 airflow: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 493 airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
494 shipyard: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 494 shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
495 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 495 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
496 shipyard_db_init: docker.io/postgres:9.5 496 shipyard_db_init: docker.io/postgres:9.5
497 shipyard_db_sync: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 497 shipyard_db_sync: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
498 airflow_db_init: docker.io/postgres:9.5 498 airflow_db_init: docker.io/postgres:9.5
499 airflow_db_sync: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 499 airflow_db_sync: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
500 ks_user: docker.io/openstackhelm/heat:ocata 500 ks_user: docker.io/openstackhelm/heat:ocata
501 ks_service: docker.io/openstackhelm/heat:ocata 501 ks_service: docker.io/openstackhelm/heat:ocata
502 ks_endpoints: docker.io/openstackhelm/heat:ocata 502 ks_endpoints: docker.io/openstackhelm/heat:ocata
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index 9376cdf..a5a810e 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -274,12 +274,12 @@ data:
274 type: git 274 type: git
275 location: https://git.openstack.org/openstack/airship-shipyard 275 location: https://git.openstack.org/openstack/airship-shipyard
276 subpath: charts/shipyard 276 subpath: charts/shipyard
277 reference: 188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 277 reference: 0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
278 shipyard-htk: 278 shipyard-htk:
279 type: git 279 type: git
280 location: https://git.openstack.org/openstack/openstack-helm-infra 280 location: https://git.openstack.org/openstack/openstack-helm-infra
281 subpath: helm-toolkit 281 subpath: helm-toolkit
282 reference: b6fc24b9960bc6de29aa70c7d5b7725319046160 282 reference: bb3ff98d53c38a2ba70f506a8b6dc36207baa207
283 tiller: 283 tiller:
284 type: git 284 type: git
285 location: https://git.openstack.org/openstack/airship-armada 285 location: https://git.openstack.org/openstack/airship-armada
@@ -339,13 +339,13 @@ data:
339 drydock_db_init: docker.io/postgres:9.5 339 drydock_db_init: docker.io/postgres:9.5
340 drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99 340 drydock_db_sync: quay.io/airshipit/drydock:a41acdd7607ff5281d3df3ea435e15d5ff5c3f99
341 shipyard: 341 shipyard:
342 airflow: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 342 airflow: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
343 shipyard: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 343 shipyard: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
344 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 344 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
345 shipyard_db_init: docker.io/postgres:9.5 345 shipyard_db_init: docker.io/postgres:9.5
346 shipyard_db_sync: quay.io/airshipit/shipyard:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 346 shipyard_db_sync: quay.io/airshipit/shipyard:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
347 airflow_db_init: docker.io/postgres:9.5 347 airflow_db_init: docker.io/postgres:9.5
348 airflow_db_sync: quay.io/airshipit/airflow:188aa9d9f1bb4d2b95fb72783a44ee5d06eb331b 348 airflow_db_sync: quay.io/airshipit/airflow:0a14e7e80fb7b7bd41b29e9690f231229c1e95ca
349 ks_user: docker.io/openstackhelm/heat:ocata 349 ks_user: docker.io/openstackhelm/heat:ocata
350 ks_service: docker.io/openstackhelm/heat:ocata 350 ks_service: docker.io/openstackhelm/heat:ocata
351 ks_endpoints: docker.io/openstackhelm/heat:ocata 351 ks_endpoints: docker.io/openstackhelm/heat:ocata