From cff1618e40f17937b6ea89bf9bcda158736e0e76 Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Thu, 28 Jan 2021 09:16:29 +0530
Subject: [PATCH] Make the default transport POLL_SERVER_HEAT

Change it to POLL_SERVER_HEAT (Attempt 2, Earlier attempt had
issues when changing this as simultaneously deleting a bunch
of SoftwareDeployment resources). This is required to remove
swift from undercloud.

Change-Id: I639f5626013cd0ef61c1f9066fab7a7b8806287f
---
 environments/standalone/standalone-tripleo.yaml | 4 ----
 environments/undercloud.yaml                    | 1 -
 environments/undercloud/undercloud-minion.yaml  | 4 ----
 overcloud-resource-registry-puppet.j2.yaml      | 2 +-
 sample-env-generator/standalone.yaml            | 6 ------
 sample-env-generator/undercloud-minion.yaml     | 6 ------
 6 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
index cb92d6f8b4..67623eb0bd 100644
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@@ -44,10 +44,6 @@ parameter_defaults:
   # Type: comma_delimited_list
   NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']
 
-  # How the server should receive the metadata required for software configuration.
-  # Type: string
-  SoftwareConfigTransport: POLL_SERVER_HEAT
-
   # Set this to true to open up ssh access from all sources.
   # Type: boolean
   SshFirewallAllowAll: True
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 9029d85fc4..920c188391 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -86,7 +86,6 @@ parameter_defaults:
   TokenExpiration: 14400
   EnablePackageInstall: true
   StackAction: CREATE
-  SoftwareConfigTransport: POLL_SERVER_HEAT
   NeutronTunnelTypes: []
   NeutronBridgeMappings: ctlplane:br-ctlplane
   NeutronAgentExtensions: []
diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml
index 7f2b72e968..fb1d6fe2ab 100644
--- a/environments/undercloud/undercloud-minion.yaml
+++ b/environments/undercloud/undercloud-minion.yaml
@@ -96,10 +96,6 @@ parameter_defaults:
   # Type: comma_delimited_list
   NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']
 
-  # How the server should receive the metadata required for software configuration.
-  # Type: string
-  SoftwareConfigTransport: POLL_SERVER_HEAT
-
   # Set this to true to open up ssh access from all sources.
   # Type: boolean
   SshFirewallAllowAll: True
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 18c0793376..95f2b50a39 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -346,7 +346,7 @@ parameter_defaults:
   NeutronMechanismDrivers: ovn
   ContainerCli: podman
   EnablePackageInstall: false
-  SoftwareConfigTransport: POLL_TEMP_URL
+  SoftwareConfigTransport: POLL_SERVER_HEAT
 
 {% for role in roles %}
   # Parameters generated for {{role.name}} Role
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index eee3e328f1..f95de55dbc 100644
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@@ -37,11 +37,6 @@ environments:
       deployment/sshd/sshd-baremetal-ansible.yaml:
         parameters:
           - SshFirewallAllowAll
-      # TODO(aschultz): hack to pull in this config transport, not sure it is
-      # still needed.
-      puppet/controller-role.yaml:
-        parameters:
-          - SoftwareConfigTransport
       sample-env-generator/standalone.yaml:
         parameters:
           - AddVipsToEtcHosts
@@ -53,7 +48,6 @@ environments:
     sample_values:
       AddVipsToEtcHosts: false
       StackAction: CREATE
-      SoftwareConfigTransport: POLL_SERVER_HEAT
       EnablePackageInstall: true
       SwiftReplicas: 1
       SshFirewallAllowAll: true
diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml
index e572a52613..c5d6f7454e 100644
--- a/sample-env-generator/undercloud-minion.yaml
+++ b/sample-env-generator/undercloud-minion.yaml
@@ -18,11 +18,6 @@ environments:
       deployment/sshd/sshd-baremetal-ansible.yaml:
         parameters:
           - SshFirewallAllowAll
-      # TODO(aschultz): hack to pull in this config transport, not sure it is
-      # still needed.
-      puppet/controller-role.yaml:
-        parameters:
-          - SoftwareConfigTransport
       overcloud.yaml:
         parameters:
           - DnsServers
@@ -53,7 +48,6 @@ environments:
     sample_values:
       # Normal bits for standalone
       StackAction: CREATE
-      SoftwareConfigTransport: POLL_SERVER_HEAT
       EnablePackageInstall: true
       SshFirewallAllowAll: true
       HeatEngineOptVolumes: