Browse Source

Use native ansible for nic config of undercloud minion

This switches minion to use native ansible for nic config.

Change-Id: I247bf54c7cf4b75e6352b402aae923ddb2c3ebd6
changes/93/756193/1
Rabi Mishra 1 year ago
parent
commit
ab760a1ba1
  1. 9
      environments/undercloud/undercloud-minion.yaml
  2. 18
      sample-env-generator/undercloud-minion.yaml

9
environments/undercloud/undercloud-minion.yaml

@ -104,6 +104,14 @@ parameter_defaults:
# Type: boolean
SshFirewallAllowAll: True
# UndercloudMinion NetworkConfigTemplate
# Type: string
UndercloudMinionNetworkConfigTemplate: templates/undercloud.j2
# UndercloudMinion NetworkConfig with ansible flag
# Type: boolean
UndercloudMinionNetworkConfigWithAnsible: True
resource_registry:
OS::TripleO::Network::Ports::ControlPlaneVipPort: 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::Xinetd: OS::Heat::None
OS::TripleO::Services::Zaqar: OS::Heat::None
OS::TripleO::UndercloudMinion::Net::SoftwareConfig: ../../net-config-undercloud.yaml

18
sample-env-generator/undercloud-minion.yaml

@ -26,6 +26,10 @@ environments:
overcloud.yaml:
parameters:
- DnsServers
sample-env-generator/undercloud-minion.yaml:
parameters:
- UndercloudMinionNetworkConfigTemplate
- UndercloudMinionNetworkConfigWithAnsible
deployment/ironic/ironic-conductor-container-puppet.yaml:
parameters:
- IronicCleaningDiskErase
@ -77,9 +81,10 @@ environments:
IronicInspectorInterface: br-ctlplane
IronicProvisioningNetwork: 'ctlplane'
IronicRescuingNetwork: 'ctlplane'
UndercloudMinionNetworkConfigTemplate: 'templates/undercloud.j2'
UndercloudMinionNetworkConfigWithAnsible: true
resource_registry:
# 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
# Activate container image prepare
@ -281,3 +286,14 @@ environments:
OS::TripleO::Services::VRTSHyperScale: OS::Heat::None
OS::TripleO::Services::Xinetd: 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…
Cancel
Save