summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Tang <roy.s.tang@att.com>2019-12-14 06:28:02 +0000
committerBin Hu <bin.hu@att.com>2019-12-19 07:04:02 +0000
commit9a2d66430bc6dffefccbe412c840cc42a52eb8e0 (patch)
tree970942a6df07d1fd01a02edfe58f87bc65d1a018
parent2b02c8d45949c8be1c54ac78a5d5ccc9cea09496 (diff)
Update pod10 to treasuremap v1.6
Change-Id: I299829d8d64641220f926eac5178d8aaa545d4d0 Signed-off-by: Roy Tang <roy.s.tang@att.com> (cherry picked from commit a895beb7d08ac149db0e740ca60926ea4212fcc8)
-rw-r--r--site/intel-pod10/site-definition.yaml2
-rw-r--r--site/intel-pod10/software/charts/osh/openstack-compute-kit/neutron.yaml2
-rw-r--r--site/intel-pod10/software/charts/osh/openstack-compute-kit/nova.yaml3
3 files changed, 4 insertions, 3 deletions
diff --git a/site/intel-pod10/site-definition.yaml b/site/intel-pod10/site-definition.yaml
index 2c24965..f435f04 100644
--- 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
--- 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
--- 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: .