Browse Source

Re-enable divingbell

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

Change-Id: I4e539e0c858a35314d1b2c8ccdbac8b1cafae474
Anderson, Craig (ca846m) 2 months ago
parent
commit
e34589c4b3

+ 1
- 1
deployment_files/global/v1.0demo/software/config/versions.yaml View File

@@ -167,7 +167,7 @@ data:
167 167
         type: git
168 168
       divingbell:
169 169
         location: https://git.openstack.org/openstack/airship-divingbell
170
-        reference: a648dcb2db2b842656bfee08102081023080e4d5
170
+        reference: 87dbc54044fd679f56123ffb1db9fefd35a77801
171 171
         subpath: divingbell
172 172
         type: git
173 173
       divingbell-htk:

+ 1
- 5
deployment_files/global/v1.0demo/software/manifests/bootstrap.yaml View File

@@ -19,9 +19,5 @@ data:
19 19
     - ucp-storage-provisioner
20 20
     - ucp-core
21 21
     - ucp-keystone
22
-# TODO(bryan-strassner)
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
22
+    - ucp-divingbell
27 23
     - ucp-services

+ 1
- 5
deployment_files/global/v1.0demo/software/manifests/full-site.yaml View File

@@ -19,11 +19,7 @@ data:
19 19
     - ucp-storage-provisioner
20 20
     - ucp-core
21 21
     - ucp-keystone
22
-# TODO(bryan-strassner)
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
22
+    - ucp-divingbell
27 23
     - ucp-services
28 24
     - openstack-ingress-controller
29 25
     - openstack-component-infrastructure

+ 1
- 1
deployment_files/global/v1.0dev/software/config/versions.yaml View File

@@ -170,7 +170,7 @@ data:
170 170
         type: git
171 171
         location: https://git.openstack.org/openstack/airship-divingbell
172 172
         subpath: divingbell
173
-        reference: 0ac90c40a0741a929204d139dfa0415562b7044e
173
+        reference: 87dbc54044fd679f56123ffb1db9fefd35a77801
174 174
       divingbell-htk:
175 175
         type: git
176 176
         location: https://git.openstack.org/openstack/openstack-helm-infra

+ 1
- 5
deployment_files/global/v1.0dev/software/manifests/bootstrap.yaml View File

@@ -19,9 +19,5 @@ data:
19 19
     - ucp-storage-provisioner
20 20
     - ucp-core
21 21
     - ucp-keystone
22
-# TODO(bryan-strassner)
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
22
+    - ucp-divingbell
27 23
     - ucp-services

+ 1
- 5
deployment_files/global/v1.0dev/software/manifests/full-site.yaml View File

@@ -19,9 +19,5 @@ data:
19 19
     - ucp-storage-provisioner
20 20
     - ucp-core
21 21
     - ucp-keystone
22
-# TODO(bryan-strassner)
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
22
+    - ucp-divingbell
27 23
     - ucp-services

Loading…
Cancel
Save