summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnderson, Craig (ca846m) <craig.anderson@att.com>2019-01-24 13:59:38 -0800
committerAnderson, Craig (ca846m) <craig.anderson@att.com>2019-01-24 14:00:23 -0800
commite34589c4b36ce749b778e9b78fc5dfe60dc87e29 (patch)
tree96a1463e9099e2d6a2ad7f3ebe6afc5a015ac8d2
parent58bcb4855b406f4559bad5f21c58e2d1101d78cb (diff)
Re-enable divingbell
Re-enable divingbell, and use a divingbell version that is compatible with the version of helm toolkit. Change-Id: I4e539e0c858a35314d1b2c8ccdbac8b1cafae474
Notes
Notes (review): Code-Review+1: Georg Kunz <georg.kunz@ericsson.com> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> 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: Fri, 25 Jan 2019 17:45:06 +0000 Reviewed-on: https://review.openstack.org/633074 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml2
-rw-r--r--deployment_files/global/v1.0demo/software/manifests/bootstrap.yaml6
-rw-r--r--deployment_files/global/v1.0demo/software/manifests/full-site.yaml6
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml2
-rw-r--r--deployment_files/global/v1.0dev/software/manifests/bootstrap.yaml6
-rw-r--r--deployment_files/global/v1.0dev/software/manifests/full-site.yaml6
6 files changed, 6 insertions, 22 deletions
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 083a884..d8b3eb0 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -167,7 +167,7 @@ data:
167 type: git 167 type: git
168 divingbell: 168 divingbell:
169 location: https://git.openstack.org/openstack/airship-divingbell 169 location: https://git.openstack.org/openstack/airship-divingbell
170 reference: a648dcb2db2b842656bfee08102081023080e4d5 170 reference: 87dbc54044fd679f56123ffb1db9fefd35a77801
171 subpath: divingbell 171 subpath: divingbell
172 type: git 172 type: git
173 divingbell-htk: 173 divingbell-htk:
diff --git a/deployment_files/global/v1.0demo/software/manifests/bootstrap.yaml b/deployment_files/global/v1.0demo/software/manifests/bootstrap.yaml
index 24ec5a1..8563fed 100644
--- a/deployment_files/global/v1.0demo/software/manifests/bootstrap.yaml
+++ b/deployment_files/global/v1.0demo/software/manifests/bootstrap.yaml
@@ -19,9 +19,5 @@ data:
19 - ucp-storage-provisioner 19 - ucp-storage-provisioner
20 - ucp-core 20 - ucp-core
21 - ucp-keystone 21 - ucp-keystone
22# TODO(bryan-strassner) 22 - ucp-divingbell
23# Excluding diving bell for now - crash loop on uamlite in this env
24# might be missing configuration, might be a symptom of running in a VM
25# same change in full-site manifest.
26# - ucp-divingbell
27 - ucp-services 23 - ucp-services
diff --git a/deployment_files/global/v1.0demo/software/manifests/full-site.yaml b/deployment_files/global/v1.0demo/software/manifests/full-site.yaml
index 04129c6..3f4a1e9 100644
--- a/deployment_files/global/v1.0demo/software/manifests/full-site.yaml
+++ b/deployment_files/global/v1.0demo/software/manifests/full-site.yaml
@@ -19,11 +19,7 @@ data:
19 - ucp-storage-provisioner 19 - ucp-storage-provisioner
20 - ucp-core 20 - ucp-core
21 - ucp-keystone 21 - ucp-keystone
22# TODO(bryan-strassner) 22 - ucp-divingbell
23# Excluding diving bell for now - crash loop on uamlite in this env
24# might be missing configuration, might be a symptom of running in a VM
25# same change in bootstrap manifest.
26# - ucp-divingbell
27 - ucp-services 23 - ucp-services
28 - openstack-ingress-controller 24 - openstack-ingress-controller
29 - openstack-component-infrastructure 25 - openstack-component-infrastructure
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index b124258..e134eac 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -170,7 +170,7 @@ data:
170 type: git 170 type: git
171 location: https://git.openstack.org/openstack/airship-divingbell 171 location: https://git.openstack.org/openstack/airship-divingbell
172 subpath: divingbell 172 subpath: divingbell
173 reference: 0ac90c40a0741a929204d139dfa0415562b7044e 173 reference: 87dbc54044fd679f56123ffb1db9fefd35a77801
174 divingbell-htk: 174 divingbell-htk:
175 type: git 175 type: git
176 location: https://git.openstack.org/openstack/openstack-helm-infra 176 location: https://git.openstack.org/openstack/openstack-helm-infra
diff --git a/deployment_files/global/v1.0dev/software/manifests/bootstrap.yaml b/deployment_files/global/v1.0dev/software/manifests/bootstrap.yaml
index 24ec5a1..8563fed 100644
--- a/deployment_files/global/v1.0dev/software/manifests/bootstrap.yaml
+++ b/deployment_files/global/v1.0dev/software/manifests/bootstrap.yaml
@@ -19,9 +19,5 @@ data:
19 - ucp-storage-provisioner 19 - ucp-storage-provisioner
20 - ucp-core 20 - ucp-core
21 - ucp-keystone 21 - ucp-keystone
22# TODO(bryan-strassner) 22 - ucp-divingbell
23# Excluding diving bell for now - crash loop on uamlite in this env
24# might be missing configuration, might be a symptom of running in a VM
25# same change in full-site manifest.
26# - ucp-divingbell
27 - ucp-services 23 - ucp-services
diff --git a/deployment_files/global/v1.0dev/software/manifests/full-site.yaml b/deployment_files/global/v1.0dev/software/manifests/full-site.yaml
index 816d128..6387867 100644
--- a/deployment_files/global/v1.0dev/software/manifests/full-site.yaml
+++ b/deployment_files/global/v1.0dev/software/manifests/full-site.yaml
@@ -19,9 +19,5 @@ data:
19 - ucp-storage-provisioner 19 - ucp-storage-provisioner
20 - ucp-core 20 - ucp-core
21 - ucp-keystone 21 - ucp-keystone
22# TODO(bryan-strassner) 22 - ucp-divingbell
23# Excluding diving bell for now - crash loop on uamlite in this env
24# might be missing configuration, might be a symptom of running in a VM
25# same change in full-site manifest.
26# - ucp-divingbell
27 - ucp-services 23 - ucp-services