diff options
| author |   Sridhar Rao <sridhar.rao@spirent.com> | 2019-12-19 03:55:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-12-19 03:55:22 +0000 |
| commit | c9b48a6daf410d6a834ab7a4c64c3a4e6f9f6a44 (patch) | |
| tree | 970942a6df07d1fd01a02edfe58f87bc65d1a018 /site | |
| parent | 1c399dffed58eda5ce3cd29bd5815ca3ed838137 (diff) | |
| parent | a895beb7d08ac149db0e740ca60926ea4212fcc8 (diff) | |
Merge "Update pod10 to treasuremap v1.6"
Diffstat (limited to 'site')
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: . |