From e34589c4b36ce749b778e9b78fc5dfe60dc87e29 Mon Sep 17 00:00:00 2001
From: "Anderson, Craig (ca846m)" <craig.anderson@att.com>
Date: Thu, 24 Jan 2019 13:59:38 -0800
Subject: [PATCH] Re-enable divingbell

Re-enable divingbell, and use a divingbell version that is compatible
with the version of helm toolkit.

Change-Id: I4e539e0c858a35314d1b2c8ccdbac8b1cafae474
---
 .../global/v1.0demo/software/config/versions.yaml           | 2 +-
 .../global/v1.0demo/software/manifests/bootstrap.yaml       | 6 +-----
 .../global/v1.0demo/software/manifests/full-site.yaml       | 6 +-----
 .../global/v1.0dev/software/config/versions.yaml            | 2 +-
 .../global/v1.0dev/software/manifests/bootstrap.yaml        | 6 +-----
 .../global/v1.0dev/software/manifests/full-site.yaml        | 6 +-----
 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 083a884d..d8b3eb04 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:
         type: git
       divingbell:
         location: https://git.openstack.org/openstack/airship-divingbell
-        reference: a648dcb2db2b842656bfee08102081023080e4d5
+        reference: 87dbc54044fd679f56123ffb1db9fefd35a77801
         subpath: divingbell
         type: git
       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 24ec5a1c..8563fed7 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:
     - ucp-storage-provisioner
     - ucp-core
     - ucp-keystone
-# TODO(bryan-strassner)
-# Excluding diving bell for now - crash loop on uamlite in this env
-# might be missing configuration, might be a symptom of running in a VM
-# same change in full-site manifest.
-#    - ucp-divingbell
+    - ucp-divingbell
     - 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 04129c66..3f4a1e9c 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:
     - ucp-storage-provisioner
     - ucp-core
     - ucp-keystone
-# TODO(bryan-strassner)
-# Excluding diving bell for now - crash loop on uamlite in this env
-# might be missing configuration, might be a symptom of running in a VM
-# same change in bootstrap manifest.
-#    - ucp-divingbell
+    - ucp-divingbell
     - ucp-services
     - openstack-ingress-controller
     - 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 b1242587..e134eac7 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:
         type: git
         location: https://git.openstack.org/openstack/airship-divingbell
         subpath: divingbell
-        reference: 0ac90c40a0741a929204d139dfa0415562b7044e
+        reference: 87dbc54044fd679f56123ffb1db9fefd35a77801
       divingbell-htk:
         type: git
         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 24ec5a1c..8563fed7 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:
     - ucp-storage-provisioner
     - ucp-core
     - ucp-keystone
-# TODO(bryan-strassner)
-# Excluding diving bell for now - crash loop on uamlite in this env
-# might be missing configuration, might be a symptom of running in a VM
-# same change in full-site manifest.
-#    - ucp-divingbell
+    - ucp-divingbell
     - 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 816d1282..63878678 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:
     - ucp-storage-provisioner
     - ucp-core
     - ucp-keystone
-# TODO(bryan-strassner)
-# Excluding diving bell for now - crash loop on uamlite in this env
-# might be missing configuration, might be a symptom of running in a VM
-# same change in full-site manifest.
-#    - ucp-divingbell
+    - ucp-divingbell
     - ucp-services