Merge "Remove overcloud_common.pp"

openstack-archive · Sep 24, 2020 · 3961826 · 3961826
2 parents b2d3c05 + 7ffa24c
commit 3961826
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 43 deletions.
diff --git a/common/services/role.role.j2.yaml b/common/services/role.role.j2.yaml
@@ -64,20 +64,14 @@ resources:
     properties:
       type: string
       value:
-        list_join:
-          - "\n"
-          - - str_replace:
-                template: {get_file: ../../puppet/manifests/overcloud_common.pp}
-                params:
-                  __ROLE__: {get_param: RoleName}
-            - yaql:
-                expression:
-                  # select 'step_config' only from services that do not have a docker_config
-                  coalesce($.data.service_names, []).zip(coalesce($.data.step_config, []), coalesce($.data.docker_config, [])).where($[2] = null).where($[1] != null).select($[1]).join("\n")
-                data:
-                  service_names: {get_attr: [ServiceChain, role_data, service_name]}
-                  step_config: {get_attr: [ServiceChain, role_data, step_config]}
-                  docker_config: {get_attr: [ServiceChain, role_data, docker_config]}
+        yaql:
+          expression:
+            # select 'step_config' only from services that do not have a docker_config
+            coalesce($.data.service_names, []).zip(coalesce($.data.step_config, []), coalesce($.data.docker_config, [])).where($[2] = null).where($[1] != null).select($[1]).join("\n")
+          data:
+            service_names: {get_attr: [ServiceChain, role_data, service_name]}
+            step_config: {get_attr: [ServiceChain, role_data, step_config]}
+            docker_config: {get_attr: [ServiceChain, role_data, docker_config]}
 
   DockerConfig:
     type: OS::Heat::Value

diff --git a/puppet/manifests/overcloud_common.pp b/puppet/manifests/overcloud_common.pp