From 34babe6a095bcc67a14544ce7db65177ac4a54dd Mon Sep 17 00:00:00 2001
From: Roy Tang <roy.s.tang@att.com>
Date: Mon, 16 Sep 2019 21:24:06 +0000
Subject: [PATCH] Update neutron document in global.

By updating the neutron global document name, it will allow neutron
to be properly replaced at the type and site level as needed.

Change-Id: I2bb734d527aa58fbd0a60252d2630c11f7cd4652
---
 global/software/charts/osh/openstack-compute-kit/neutron.yaml   | 2 +-
 .../aiab/software/charts/osh/openstack-compute-kit/neutron.yaml | 2 +-
 .../software/charts/osh/openstack-compute-kit/neutron.yaml      | 2 +-
 type/skiff/charts/osh/openstack-compute-kit/neutron.yaml        | 1 -
 type/sloop/charts/osh/comps/neutron.yaml                        | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/global/software/charts/osh/openstack-compute-kit/neutron.yaml b/global/software/charts/osh/openstack-compute-kit/neutron.yaml
index dc48584cd..46e0a5760 100644
--- a/global/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/global/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -2,7 +2,7 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: neutron
+  name: neutron-global
   labels:
     name: neutron-global
     component: neutron
diff --git a/site/aiab/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/aiab/software/charts/osh/openstack-compute-kit/neutron.yaml
index 66f3c4063..f30151c5d 100644
--- a/site/aiab/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/site/aiab/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -8,7 +8,7 @@ metadata:
     abstract: false
     layer: site
     parentSelector:
-      name: neutron-global
+      name: neutron-type
     actions:
       - method: merge
         path: .
diff --git a/site/seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml
index 254736048..e4ca8951a 100644
--- a/site/seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/site/seaworthy/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -9,7 +9,7 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: neutron-fixme
+  name: neutron
   layeringDefinition:
     abstract: false
     layer: site
diff --git a/type/skiff/charts/osh/openstack-compute-kit/neutron.yaml b/type/skiff/charts/osh/openstack-compute-kit/neutron.yaml
index a1996b2d8..0a840ae5e 100644
--- a/type/skiff/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/type/skiff/charts/osh/openstack-compute-kit/neutron.yaml
@@ -3,7 +3,6 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: neutron
-  replacement: true
   labels:
     name: neutron-type
     component: neutron
diff --git a/type/sloop/charts/osh/comps/neutron.yaml b/type/sloop/charts/osh/comps/neutron.yaml
index c9f324d87..cd49fd6cd 100644
--- a/type/sloop/charts/osh/comps/neutron.yaml
+++ b/type/sloop/charts/osh/comps/neutron.yaml
@@ -2,7 +2,7 @@
 schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
-  name: neutron-fixme
+  name: neutron
   labels:
     name: neutron-type
   layeringDefinition: