diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-02-24 07:23:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-02-24 07:23:48 +0000 |
| commit | 78cc593c984532f336fac9ead3c444cfce2019c5 (patch) | |
| tree | cb999b7d794a604a945d34e4ae1b1e4c7d5ec150 /kubernetes/oof/resources/config | |
| parent | cce7fa63c498e51a0327378e87d253f5cf17ca05 (diff) | |
| parent | 3865d69d33f8f69f7d075d8597b4178e3a5c1442 (diff) | |
Merge "[OOF] Update image versions"
Diffstat (limited to 'kubernetes/oof/resources/config')
| -rw-r--r-- | kubernetes/oof/resources/config/conf/common_config.yaml | 18 | ||||
| -rwxr-xr-x | kubernetes/oof/resources/config/conf/osdf_config.yaml | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/kubernetes/oof/resources/config/conf/common_config.yaml b/kubernetes/oof/resources/config/conf/common_config.yaml index 1109ab8167..78afa5e5f8 100644 --- a/kubernetes/oof/resources/config/conf/common_config.yaml +++ b/kubernetes/oof/resources/config/conf/common_config.yaml @@ -12,6 +12,7 @@ osdf_temp: # special configuration required for "workarounds" or testing global_disabled: True local_placement_policies_enabled: True local_slice_selection_policies_enabled: True + local_nst_selection_policies_enabled: True placement_policy_dir_vcpe: "./test/policy-local-files/" placement_policy_files_vcpe: # workaroud for policy platform glitches (or "work-arounds" for other components) - Affinity_vCPE_1.json @@ -45,6 +46,12 @@ osdf_temp: # special configuration required for "workarounds" or testing - query_policy_nsi.json - threshold_policy_nsi.json - vnf_policy_nsi_shared_case.json + nst_selection_policy_dir_nst: "./test/policy-local-files/nst-selection-files/" + nst_selection_policy_files_nst: + - query_policy_nst.json + - attribute_policy_nst.json + - vnf_policy_nst.json + - optimization_policy_nst.json service_info: vCPE: @@ -95,6 +102,17 @@ policy_info: resources: - get_param: service_name + nst_selection: + policy_fetch: by_scope + policy_scope: + - + scope: + - OSDF_GUILIN + services: + - nst + resources: + - nst + subnet_selection: policy_fetch: by_scope policy_scope: diff --git a/kubernetes/oof/resources/config/conf/osdf_config.yaml b/kubernetes/oof/resources/config/conf/osdf_config.yaml index 97d037a8f8..6df3ed948b 100755 --- a/kubernetes/oof/resources/config/conf/osdf_config.yaml +++ b/kubernetes/oof/resources/config/conf/osdf_config.yaml @@ -67,3 +67,6 @@ desPassword: {{ .Values.config.desPassword }} #key appkey: '' + +activateConsulConfig: False + |