Merge "Bundle Airship services into a single ChartGroup"

deployment_files/global/v1.0u/software/charts/ucp/services-chart-group.yaml

@@ -0,0 +1,21 @@
+---
+schema: armada/ChartGroup/v1
+metadata:
+  schema: metadata/Document/v1
+  name: ucp-services
+  layeringDefinition:
+    abstract: false
+    layer: global
+  storagePolicy: cleartext
+data:
+  description: UCP Services
+  sequenced: false
+  chart_group:
+    - ucp-tiller
+    - ucp-armada
+    - ucp-barbican
+    - ucp-deckhand
+    - ucp-drydock
+    - ucp-maas
+    - ucp-promenade
+    - ucp-shipyard

deployment_files/global/v1.0u/software/manifests/bootstrap.yaml

@@ -24,8 +24,4 @@ data:
 # might be missing configuration, might be a symptom of running in a VM
 # same change in full-site manifest.
 #    - ucp-divingbell
-    - ucp-armada
-    - ucp-deckhand
-    - ucp-drydock
-    - ucp-promenade
-    - ucp-shipyard
+    - ucp-services

deployment_files/global/v1.0u/software/manifests/full-site.yaml

@@ -24,8 +24,4 @@ data:
 # might be missing configuration, might be a symptom of running in a VM
 # same change in bootstrap manifest.
 #    - ucp-divingbell
-    - ucp-armada
-    - ucp-deckhand
-    - ucp-drydock
-    - ucp-promenade
-    - ucp-shipyard
+    - ucp-services