Revert "Revert "Remove os-collect-config related poperties and attributes""

Root cause fix in heat https://review.opendev.org/#/c/668718/ has landed. 

This reverts commit b5a2a61dfe.

Change-Id: I9222fb6cc0c84d871bd7d8a4808e1212fbaf3a4e

overcloud.j2.yaml

@@ -1046,15 +1046,6 @@ resources:
 {%- endfor %}
       ServiceNetMapLower: {get_attr: [ServiceNetMap, service_net_map_lower]}
 
-  ServerOsCollectConfigData:
-    type: OS::Heat::Value
-    properties:
-      type: json
-      value:
-{%- for role in roles %}
-        {{role.name}}: {get_attr: [{{role.name}}, attributes, os_collect_config]}
-{%- endfor %}
-
   DeployedServerEnvironment:
     type: OS::TripleO::DeployedServerEnvironment
     properties:
@@ -1072,20 +1063,6 @@ resources:
 {%- for role in roles %}
               - {get_attr: [{{role.name}}, deployed_server_port_map]}
 {%- endfor %}
-      DeployedServerDeploymentSwiftDataMap:
-        map_merge:
-          list_concat:
-{%- for role in roles %}
-              - {get_attr: [{{role.name}}, deployed_server_deployment_swift_data_map]}
-{%- endfor %}
-      DefaultRouteIp:
-        str_split:
-          - ':'
-          - str_split:
-            - '/'
-            - {get_attr: [ServerOsCollectConfigData, value, {{primary_role_name}}, '0', request, metadata_url]}
-            - 2
-          - 0
 
 outputs:
   ManagedEndpoints:
@@ -1161,9 +1138,6 @@ outputs:
 {%- for role in roles %}
       {{role.name}}: {{role.tags|default([])}}
 {%- endfor %}
-  ServerOsCollectConfigData:
-    description: The os-collect-config configuration associated with each server resource
-    value: {get_attr: [ServerOsCollectConfigData, value]}
   VipMap:
     description: Mapping of each network to VIP addresses. Also includes the Redis VIP.
     value:

puppet/role.role.j2.yaml

@@ -406,10 +406,6 @@ resources:
   {{server_resource_name}}:
     type: OS::TripleO::{{role.name}}Server
     deletion_policy: {get_param: ServerDeletionPolicy}
-    metadata:
-      os-collect-config:
-        command: {get_param: ConfigCommand}
-        splay: {get_param: ConfigCollectSplay}
     properties:
       image:
 {%- if role.deprecated_param_image is defined %}
@@ -899,31 +895,6 @@ outputs:
                 - '-'
                 - - {get_param: Hostname}
                   - ctlplane
-  deployed_server_deployment_swift_data_map:
-    description:
-      Map of Heat created hostname of the server to the Swift container and object
-      used to created the temporary url for metadata polling with
-      os-collect-config.
-    value:
-      map_replace:
-        - hostname:
-            container:
-              str_split:
-                - '/'
-                - {get_attr: [{{server_resource_name}}, os_collect_config, request, metadata_url]}
-                - 5
-            object:
-              str_split:
-                - '?'
-                - str_split:
-                    - '/'
-                    - {get_attr: [{{server_resource_name}}, os_collect_config, request, metadata_url]}
-                    - 6
-                - 0
-        - keys: {hostname: {get_param: Hostname}}
-  os_collect_config:
-    description: The os-collect-config configuration associated with this server resource
-    value: {get_attr: [{{server_resource_name}}, os_collect_config]}
   {%- for network in networks %}
   {%- if network.enabled|default(true) and network.name in role.networks|default([]) %}
   {{network.name_lower|default(network.name.lower())}}_ip_address: