openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Cleanup SoftwareConfigTransport"

This commit is contained in:
Zuul 2019-08-01 05:12:11 +00:00 committed by Gerrit Code Review
parent 55234d27f6 1821c01846
commit 0150750c90
5 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
environments/standalone/standalone-tripleo.yaml
View File

@ -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
View File

@ -73,7 +73,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
View File

@ -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
View File

@ -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
View File

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