From b5a2a61dfea167ed96b52098dbd5807b3fae44a6 Mon Sep 17 00:00:00 2001
From: Sergii Golovatiuk <sgolovat@redhat.com>
Date: Mon, 1 Jul 2019 14:43:20 +0000
Subject: [PATCH] Revert "Remove os-collect-config related poperties and
 attributes"

This reverts commit 89e9fe53b20ee87a6a7ebe41af48f7ab206ebf05.

Closes-Bug:  #1834881

Change-Id: I131cbafc126bcc4dbea5d38e0ff7adc177d114bd
---
 overcloud.j2.yaml        | 26 ++++++++++++++++++++++++++
 puppet/role.role.j2.yaml | 29 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index c5918427af..e8c3f63274 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -1046,6 +1046,15 @@ 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:
@@ -1063,6 +1072,20 @@ 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:
@@ -1138,6 +1161,9 @@ 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:
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 038d6bfb58..d42c955d3f 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -406,6 +406,10 @@ 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 %}
@@ -895,6 +899,31 @@ 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: