From 793062dae5bed89de9bf02fd254895099eb04e49 Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@gmail.com>
Date: Mon, 29 Oct 2018 23:11:56 -0500
Subject: [PATCH] Use global full-site (reduntant file)

Change-Id: Icd64b63a0b6125a93c4f89d2c9df226a5338d734
---
 global/software/manifests/full-site.yaml      |  6 +-
 .../software/manifests/full-site.yaml         | 57 -------------------
 2 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 site/airship-seaworthy/software/manifests/full-site.yaml

diff --git a/global/software/manifests/full-site.yaml b/global/software/manifests/full-site.yaml
index 65531422c..d5a22e20e 100644
--- a/global/software/manifests/full-site.yaml
+++ b/global/software/manifests/full-site.yaml
@@ -2,9 +2,9 @@
 schema: armada/Manifest/v1
 metadata:
   schema: metadata/Document/v1
-  name: full-site-global
+  name: full-site
   layeringDefinition:
-    abstract: true
+    abstract: false
     layer: global
   labels:
     name: full-site-global
@@ -40,7 +40,6 @@ data:
     - openstack-tenant-ceph
     - openstack-mariadb
     - openstack-memcached
-    - openstack-compute-services
     - openstack-keystone
     - openstack-radosgw
     - openstack-glance
@@ -49,5 +48,4 @@ data:
     - openstack-heat
     - osh-infra-prometheus-openstack-exporter
     - openstack-horizon
-    - openstack-barbican
 ...
diff --git a/site/airship-seaworthy/software/manifests/full-site.yaml b/site/airship-seaworthy/software/manifests/full-site.yaml
deleted file mode 100644
index 17f93cf09..000000000
--- a/site/airship-seaworthy/software/manifests/full-site.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-# This file defines the "full-site" armada manifest and should not need to
-# change for new sites.
-# #GLOBAL-CANDIDATE#
-schema: armada/Manifest/v1
-metadata:
-  schema: metadata/Document/v1
-  name: full-site
-  layeringDefinition:
-    abstract: false
-    layer: site
-    parentSelector:
-      name: full-site-global
-    actions:
-      - method: merge
-        path: .
-  storagePolicy: cleartext
-data:
-  release_prefix: airship
-  chart_groups:
-    - kubernetes-proxy
-    - kubernetes-container-networking
-    - kubernetes-dns
-    - kubernetes-etcd
-    - kubernetes-haproxy
-    - kubernetes-core
-    - ingress-kube-system
-    - ucp-ceph-update
-    - ucp-ceph-config
-    - ucp-core
-    - ucp-keystone
-    - ucp-divingbell
-    - ucp-armada
-    - ucp-deckhand
-    - ucp-drydock
-    - ucp-promenade
-    - ucp-shipyard
-    - osh-infra-ingress-controller
-    - osh-infra-ceph-config
-    - osh-infra-logging
-    - osh-infra-monitoring
-    - osh-infra-mariadb
-    - osh-infra-dashboards
-    - openstack-ingress-controller
-    - openstack-ceph-config
-    - openstack-tenant-ceph
-    - openstack-mariadb
-    - openstack-memcached
-    - openstack-keystone
-    - openstack-radosgw
-    - openstack-glance
-    - openstack-cinder
-    - openstack-compute-kit
-    - openstack-heat
-    - osh-infra-prometheus-openstack-exporter
-    - openstack-horizon
-...