Use native ansible for nic config of undercloud minion
This switches minion to use native ansible for nic config. Change-Id: I247bf54c7cf4b75e6352b402aae923ddb2c3ebd6
This commit is contained in:
parent
9c47b31f60
commit
ab760a1ba1
|
@ -104,6 +104,14 @@ parameter_defaults:
|
||||||
# Type: boolean
|
# Type: boolean
|
||||||
SshFirewallAllowAll: True
|
SshFirewallAllowAll: True
|
||||||
|
|
||||||
|
# UndercloudMinion NetworkConfigTemplate
|
||||||
|
# Type: string
|
||||||
|
UndercloudMinionNetworkConfigTemplate: templates/undercloud.j2
|
||||||
|
|
||||||
|
# UndercloudMinion NetworkConfig with ansible flag
|
||||||
|
# Type: boolean
|
||||||
|
UndercloudMinionNetworkConfigWithAnsible: True
|
||||||
|
|
||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None
|
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None
|
||||||
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
OS::TripleO::OVNMacAddressNetwork: OS::Heat::None
|
||||||
|
@ -293,4 +301,3 @@ resource_registry:
|
||||||
OS::TripleO::Services::Vpp: OS::Heat::None
|
OS::TripleO::Services::Vpp: OS::Heat::None
|
||||||
OS::TripleO::Services::Xinetd: OS::Heat::None
|
OS::TripleO::Services::Xinetd: OS::Heat::None
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
OS::TripleO::UndercloudMinion::Net::SoftwareConfig: ../../net-config-undercloud.yaml
|
|
||||||
|
|
|
@ -26,6 +26,10 @@ environments:
|
||||||
overcloud.yaml:
|
overcloud.yaml:
|
||||||
parameters:
|
parameters:
|
||||||
- DnsServers
|
- DnsServers
|
||||||
|
sample-env-generator/undercloud-minion.yaml:
|
||||||
|
parameters:
|
||||||
|
- UndercloudMinionNetworkConfigTemplate
|
||||||
|
- UndercloudMinionNetworkConfigWithAnsible
|
||||||
deployment/ironic/ironic-conductor-container-puppet.yaml:
|
deployment/ironic/ironic-conductor-container-puppet.yaml:
|
||||||
parameters:
|
parameters:
|
||||||
- IronicCleaningDiskErase
|
- IronicCleaningDiskErase
|
||||||
|
@ -77,9 +81,10 @@ environments:
|
||||||
IronicInspectorInterface: br-ctlplane
|
IronicInspectorInterface: br-ctlplane
|
||||||
IronicProvisioningNetwork: 'ctlplane'
|
IronicProvisioningNetwork: 'ctlplane'
|
||||||
IronicRescuingNetwork: 'ctlplane'
|
IronicRescuingNetwork: 'ctlplane'
|
||||||
|
UndercloudMinionNetworkConfigTemplate: 'templates/undercloud.j2'
|
||||||
|
UndercloudMinionNetworkConfigWithAnsible: true
|
||||||
resource_registry:
|
resource_registry:
|
||||||
# this network config is assumed by the tripleo deploy command
|
# this network config is assumed by the tripleo deploy command
|
||||||
OS::TripleO::UndercloudMinion::Net::SoftwareConfig: ../../net-config-undercloud.yaml
|
|
||||||
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None
|
OS::TripleO::Network::Ports::ControlPlaneVipPort: OS::Heat::None
|
||||||
|
|
||||||
# Activate container image prepare
|
# Activate container image prepare
|
||||||
|
@ -281,3 +286,14 @@ environments:
|
||||||
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
|
||||||
OS::TripleO::Services::Xinetd: OS::Heat::None
|
OS::TripleO::Services::Xinetd: OS::Heat::None
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
|
# Role specific dynamic parameters, to be defined here
|
||||||
|
# for sample env generator to be happy.
|
||||||
|
parameters:
|
||||||
|
UndercloudMinionNetworkConfigTemplate:
|
||||||
|
description: UndercloudMinion NetworkConfigTemplate
|
||||||
|
type: string
|
||||||
|
default: ''
|
||||||
|
UndercloudMinionNetworkConfigWithAnsible:
|
||||||
|
description: UndercloudMinion NetworkConfig with ansible flag
|
||||||
|
type: boolean
|
||||||
|
default: False
|
||||||
|
|
Loading…
Reference in New Issue