Browse Source

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
changes/45/673345/2
Alex Schultz 2 years ago
parent
commit
1821c01846
  1. 4
      environments/standalone/standalone-tripleo.yaml
  2. 1
      environments/undercloud.yaml
  3. 4
      environments/undercloud/undercloud-minion.yaml
  4. 4
      sample-env-generator/standalone.yaml
  5. 4
      sample-env-generator/undercloud-minion.yaml

4
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

1
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: []

4
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

4
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

4
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:

Loading…
Cancel
Save