openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Merge "CI overrides the tripleoclient config code"

This commit is contained in:
Zuul 2018-06-28 09:36:20 +00:00 committed by Gerrit Code Review
parent 35bbe9600b ff9fe54d24
commit c00e652b36
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
roles/undercloud-deploy/defaults/main.yml
View File

@ -69,16 +69,7 @@ undercloud_undercloud_debug: true
# Use to populate the resource registry for nic configs and networking setup
undercloud_resource_registry_args:
OS::TripleO::Undercloud::Net::SoftwareConfig: "{{overcloud_templates_path}}/net-config-noop.yaml"
undercloud_network_environment_args:
UndercloudNetworkCidr: "{{undercloud_network_cidr}}"
UndercloudDhcpRangeStart: "{{undercloud_dhcp_start|default(
undercloud_network_cidr|nthhost(5))}}"
UndercloudDhcpRangeEnd: "{{undercloud_dhcp_end|default(
undercloud_network_cidr|nthhost(30))}}"
UndercloudNetworkGateway: "{{undercloud_network_gateway|default(
undercloud_network_cidr|nthhost(1))}}"
UndercloudNameserver: "{% if undercloud_undercloud_nameservers is string %}{{undercloud_undercloud_nameservers.split(',')[0]}}{% else %}{{undercloud_undercloud_nameservers[-1]}}{% endif %}"
ControlPlaneSubnetCidr: 24
undercloud_network_environment_args: {}
ctlplane_masquerade: false