Update pod10 to treasuremap v1.6

Change-Id: I299829d8d64641220f926eac5178d8aaa545d4d0
Signed-off-by: Roy Tang <roy.s.tang@att.com>
(cherry picked from commit a895beb7d08ac149db0e740ca60926ea4212fcc8)

diff --git a/site/intel-pod10/site-definition.yaml b/site/intel-pod10/site-definition.yaml
index 2c24965..f435f04 100644 (file)
--- a/site/intel-pod10/site-definition.yaml
+++ b/site/intel-pod10/site-definition.yaml
@@ -12,6 +12,6 @@ data:
 
   repositories:
     global:
-      revision: v1.4
+      revision: v1.6
       url: https://opendev.org/airship/treasuremap.git
 ...

diff --git a/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml
index f17a685..19b7c32 100644 (file)
--- a/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -15,7 +15,7 @@ metadata:
     abstract: false
     layer: site
     parentSelector:
-      name: neutron-global
+      name: neutron-type
     actions:
       - method: merge
         path: .

diff --git a/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml b/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml
index e64738c..1dd5d65 100644 (file)
--- a/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml
+++ b/site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml
@@ -12,11 +12,12 @@ schema: armada/Chart/v1
 metadata:
   schema: metadata/Document/v1
   name: nova
+  replacement: true
   layeringDefinition:
     abstract: false
     layer: site
     parentSelector:
-      name: nova-global
+      name: nova-cntt
     actions:
       - method: merge
         path: .