[OOF] Bump versions

[oom.git] / kubernetes / oof / resources / config / conf / common_config.yaml

diff --git a/kubernetes/oof/resources/config/common_config.yaml b/kubernetes/oof/resources/config/conf/common_config.yaml
similarity index 92%
rename from kubernetes/oof/resources/config/common_config.yaml
rename to kubernetes/oof/resources/config/conf/common_config.yaml
index 7e8fe5d..1109ab8 100644 (file)
--- a/kubernetes/oof/resources/config/common_config.yaml
+++ b/kubernetes/oof/resources/config/conf/common_config.yaml
@@ -5,7 +5,7 @@ osdf_system:
         external: 8698  # clients use this port on DockerHost
     osdf_ip_default: 0.0.0.0
 #        # Important Note: At deployment time, we need to ensure the port mapping is done
-    ssl_context: ['/opt/osdf/osaaf/local/org.onap.oof.crt', '/opt/osdf/osaaf/local/org.onap.oof.key']
+    ssl_context: ['/opt/osdf/org.onap.oof.crt', '/opt/osdf/osaaf/local/org.onap.oof.key']
 
 osdf_temp:  # special configuration required for "workarounds" or testing
     local_policies:
@@ -67,6 +67,9 @@ references:
     resource_sharing_level:
         source: request
         value: serviceProfile.resourceSharingLevel
+    slice_scope:
+        source: request
+        value: slice_scope
     reuse_preference:
         source: request
         value: preferReuse
@@ -86,10 +89,11 @@ policy_info:
         policy_scope:
             -
                 scope:
-                  - get_param: resource_sharing_level
-                  - get_param: reuse_preference
+                    - get_param: slice_scope
                 services:
                     - get_param: service_name
+                resources:
+                    - get_param: service_name
 
     subnet_selection:
         policy_fetch: by_scope
@@ -98,6 +102,8 @@ policy_info:
                   - OSDF_GUILIN
               services:
                   - get_param: service_name
+              resources:
+                  - get_param: service_name
 
     placement:
         policy_fetch: by_scope