Merge "Remove mistral parameters from undercloud.yaml"
This commit is contained in:
commit
15f4077cc2
|
@ -4,5 +4,4 @@ resource_registry:
|
||||||
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml
|
OS::TripleO::Services::Podman: ../deployment/podman/podman-baremetal-ansible.yaml
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
MistralDockerGroup: false
|
|
||||||
ContainerCli: podman
|
ContainerCli: podman
|
||||||
|
|
|
@ -134,8 +134,6 @@ parameter_defaults:
|
||||||
# - ip_range: '192.168.24.100,192.168.24.200'
|
# - ip_range: '192.168.24.100,192.168.24.200'
|
||||||
IronicProvisioningNetwork: 'ctlplane'
|
IronicProvisioningNetwork: 'ctlplane'
|
||||||
IronicRescuingNetwork: 'ctlplane'
|
IronicRescuingNetwork: 'ctlplane'
|
||||||
MistralCorsAllowedOrigin: '*'
|
|
||||||
MistralExecutionFieldSizeLimit: 16384
|
|
||||||
NeutronServicePlugins: router,segments
|
NeutronServicePlugins: router,segments
|
||||||
NeutronMechanismDrivers: ['openvswitch', 'baremetal']
|
NeutronMechanismDrivers: ['openvswitch', 'baremetal']
|
||||||
NeutronNetworkVLANRanges: 'physnet1:1000:2999'
|
NeutronNetworkVLANRanges: 'physnet1:1000:2999'
|
||||||
|
@ -181,7 +179,6 @@ parameter_defaults:
|
||||||
UndercloudCtlplaneSubnets: {}
|
UndercloudCtlplaneSubnets: {}
|
||||||
UndercloudCtlplaneLocalSubnet: 'ctlplane-subnet'
|
UndercloudCtlplaneLocalSubnet: 'ctlplane-subnet'
|
||||||
UndercloudNetworkConfigTemplate: 'templates/undercloud.j2'
|
UndercloudNetworkConfigTemplate: 'templates/undercloud.j2'
|
||||||
MistralDockerGroup: true
|
|
||||||
PasswordAuthentication: 'yes'
|
PasswordAuthentication: 'yes'
|
||||||
HeatEngineOptVolumes:
|
HeatEngineOptVolumes:
|
||||||
- /usr/lib/heat:/usr/lib/heat:ro
|
- /usr/lib/heat:/usr/lib/heat:ro
|
||||||
|
|
Loading…
Reference in New Issue