From 1821c01846a20da331959ff49fe8536f1e1bf86a Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 29 Jul 2019 11:51:46 -0600 Subject: [PATCH] Cleanup SoftwareConfigTransport Since this is nwo set to POLL_SERVER_HEAT by default in the overcloud-resource-registry-puppet.j2.yaml, we no longer need to override it for the undercloud/standalone use case. See https://review.opendev.org/#/c/671980/ Change-Id: I3e2cfd856bf46fb82998e8f14c64b11299862238 --- environments/standalone/standalone-tripleo.yaml | 4 ---- environments/undercloud.yaml | 1 - environments/undercloud/undercloud-minion.yaml | 4 ---- sample-env-generator/standalone.yaml | 4 ---- sample-env-generator/undercloud-minion.yaml | 4 ---- 5 files changed, 17 deletions(-) diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 5ce6838bc0..75c1a02fd1 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -40,10 +40,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 ba58ee213f..91639772b2 100644 --- a/environments/undercloud.yaml +++ b/environments/undercloud.yaml @@ -72,7 +72,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 f83ddc1e46..ed04700e89 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -20,10 +20,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/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index b43f0f019b..0b2334de50 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -37,18 +37,14 @@ environments: deployment/sshd/sshd-baremetal-puppet.yaml: parameters: - SshFirewallAllowAll - # TODO(aschultz): hack to pull in this config transport, not sure it is - # still neded. puppet/controller-role.yaml: parameters: - - SoftwareConfigTransport - DnsServers sample-env-generator/standalone.yaml: parameters: - AddVipsToEtcHosts sample_values: 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 7523852f61..5cfeb76778 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -18,16 +18,12 @@ environments: deployment/sshd/sshd-baremetal-puppet.yaml: parameters: - SshFirewallAllowAll - # TODO(aschultz): hack to pull in this config transport, not sure it is - # still neded. puppet/controller-role.yaml: parameters: - - SoftwareConfigTransport - DnsServers sample_values: # Normal bits for standalone StackAction: CREATE - SoftwareConfigTransport: POLL_SERVER_HEAT EnablePackageInstall: true SshFirewallAllowAll: true HeatEngineOptVolumes: