From 825dc35c8f01fed967f81e1c9b1e2ffb4b0e6e1f Mon Sep 17 00:00:00 2001
From: Mark Burnett <mark.m.burnett@gmail.com>
Date: Fri, 18 May 2018 15:02:46 -0500
Subject: [PATCH] Bundle Airship services into a single ChartGroup

This makes dev deployment a bit faster.

Change-Id: I3cae1f067c37f80b77d161b196c71cb5888b82c8
---
 .../charts/ucp/services-chart-group.yaml      | 21 +++++++++++++++++++
 .../v1.0u/software/manifests/bootstrap.yaml   |  6 +-----
 .../v1.0u/software/manifests/full-site.yaml   |  6 +-----
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 deployment_files/global/v1.0u/software/charts/ucp/services-chart-group.yaml

diff --git a/deployment_files/global/v1.0u/software/charts/ucp/services-chart-group.yaml b/deployment_files/global/v1.0u/software/charts/ucp/services-chart-group.yaml
new file mode 100644
index 00000000..1c8d446e
--- /dev/null
+++ b/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
diff --git a/deployment_files/global/v1.0u/software/manifests/bootstrap.yaml b/deployment_files/global/v1.0u/software/manifests/bootstrap.yaml
index 856f15be..4725a5a1 100644
--- a/deployment_files/global/v1.0u/software/manifests/bootstrap.yaml
+++ b/deployment_files/global/v1.0u/software/manifests/bootstrap.yaml
@@ -25,8 +25,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
diff --git a/deployment_files/global/v1.0u/software/manifests/full-site.yaml b/deployment_files/global/v1.0u/software/manifests/full-site.yaml
index 72638125..510d8d97 100644
--- a/deployment_files/global/v1.0u/software/manifests/full-site.yaml
+++ b/deployment_files/global/v1.0u/software/manifests/full-site.yaml
@@ -25,8 +25,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