Revert "Stop using swift temp url for config transport"

This switch seems to be creating issues with upgrades, where a number of
software deployments are deleted concurrently while updating the config
transport for the server. Switching the config transport does not work
with convergence heat and should be fixed in heat. We can revert this
now, as we still use swift for other stuff in the undercloud. Can be
changed once the issue is fixed in heat.

It also reverts the following dependant commit.

Revert "Cleanup SoftwareConfigTransport"

This reverts commit (1821c01846 and
3ea9dd4040)

Closes-Bug: #1869335
Change-Id: I835c8be3eecce91f8a370d036bf1085bc445e01d
This commit is contained in:
Rabi Mishra 2020-03-27 16:00:10 +05:30
parent 8e0ef7156b
commit 6ff119ddac
6 changed files with 18 additions and 1 deletions

View File

@ -40,6 +40,10 @@ 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

View File

@ -77,6 +77,7 @@ parameter_defaults:
TokenExpiration: 14400
EnablePackageInstall: true
StackAction: CREATE
SoftwareConfigTransport: POLL_SERVER_HEAT
NeutronTunnelTypes: []
NeutronBridgeMappings: ctlplane:br-ctlplane
NeutronAgentExtensions: []

View File

@ -20,6 +20,10 @@ 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

View File

@ -343,7 +343,7 @@ parameter_defaults:
NeutronMechanismDrivers: ovn
ContainerCli: podman
EnablePackageInstall: false
SoftwareConfigTransport: POLL_SERVER_HEAT
SoftwareConfigTransport: POLL_TEMP_URL
{% for role in roles %}
# Parameters generated for {{role.name}} Role

View File

@ -37,14 +37,18 @@ 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

View File

@ -18,12 +18,16 @@ 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: