openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Remove ctlplane data from CI network-environment 

The change this depends on and the changes before
it remove the need to provide these parameters as
they are instead read from the subnet.

Depends-On: I5f33e06ca3f4b13cc355e02156edd9d8a1f773cd
Change-Id: I64ffeae8ead85af9aebc2e546b47d175a5a0eea7
This commit is contained in:
Harald Jensås 2018-06-25 12:59:05 +02:00 committed by Alex Schultz
parent 8d40299fcd
commit ebc09bd930
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/environments/ovb-common.yml
View File

@ -13,6 +13,7 @@ undercloud_dhcp_start: 192.168.24.5
undercloud_dhcp_end: 192.168.24.24
undercloud_inspection_iprange: 192.168.24.25,192.168.24.39
undercloud_external_network_cidr: 10.0.0.0/24
undercloud_undercloud_nameservers: "{{ overcloud_dns_servers }}"
# template copies
undercloud_instackenv_template: "{{ local_working_dir }}/instackenv.json"
@ -51,9 +52,6 @@ network_environment_args:
[{'start': '{{ undercloud_external_network_cidr|nthhost(10) }}',
'end': '{{ undercloud_external_network_cidr|nthhost(50) }}'}]
NeutronExternalNetworkBridge: ""
ControlPlaneSubnetCidr: "{{ undercloud_network_cidr|ipaddr('prefix') }}"
ControlPlaneDefaultRoute: "{{ undercloud_network_cidr|nthhost(1) }}"
EC2MetadataIp: "{{ undercloud_network_cidr|nthhost(1) }}"
ExternalInterfaceDefaultRoute: "{{ undercloud_external_network_cidr|nthhost(1) }}"
InternalApiNetCidr: 172.20.0.0/24
InternalApiAllocationPools: [{"start": "172.20.0.10", "end": "172.20.0.250"}]
@ -63,7 +61,6 @@ network_environment_args:
StorageMgmtAllocationPools: [{"start": "172.19.0.10", "end": "172.19.0.250"}]
TenantNetCidr: 172.16.0.0/24
TenantAllocationPools: [{"start": "172.16.0.10", "end": "172.16.0.250"}]
DnsServers: "{{ overcloud_dns_servers }}"
PublicVirtualFixedIPs: [{"ip_address": "{{ undercloud_external_network_cidr|nthhost(5) }}"}]
NeutronGlobalPhysnetMtu: 1350
BondInterfaceOvsOptions: bond_mode=balance-slb

4
roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv4/single_nic_vlans_ipv4.yml
View File

@ -3,8 +3,6 @@
# /home/stack/undercloud.conf for key local_ip
# # EC2MetadataIp: "local_ip"
#
# #ControlPlaneSubnetCidr: key name must match the keyname found in
# #/usr/share/openstack-tripleo-heat-templates/network/config/$type/node.yaml
parameter_defaults:
InternalApiNetCidr: 172.16.20.0/24
@ -17,7 +15,5 @@ parameter_defaults:
ExternalAllocationPools: [{'start': '172.16.23.110', 'end': '172.16.23.150'}]
ExternalInterfaceDefaultRoute: 172.16.23.1
NeutronExternalNetworkBridge: "''"
ControlPlaneSubnetCidr: "24"
ControlPlaneDefaultRoute: 192.0.2.1
EC2MetadataIp: 192.0.2.1
DnsServers: ["192.168.23.1", "8.8.8.8"]

2
roles/overcloud-deploy/files/hardware_environments/virt/network_configs/single_nic_vlans_ipv6/single_nic_vlans_ipv6.yml
View File

@ -32,7 +32,5 @@ parameters:
parameter_defaults:
DnsServers: ["192.168.122.1"] # Customize for your env
ControlPlaneSubnetCidr: "24"
EC2MetadataIp: 192.0.2.1 # Default for virt-env, customize if need be
ControlPlaneDefaultRoute: 192.0.2.1 # Default for virt-env, customize if need be
ExternalInterfaceDefaultRoute: 2001:db8:fd00:1000:dead:beef:cafe:f00

2
roles/overcloud-prep-config/defaults/main.yml
View File

@ -19,8 +19,6 @@ network_environment_args:
[{'start': '{{ undercloud_external_network_cidr|nthhost(4) }}',
'end': '{{ undercloud_external_network_cidr|nthhost(250) }}'}]
NeutronExternalNetworkBridge: ""
ControlPlaneSubnetCidr: "{{ undercloud_network_cidr|ipaddr('prefix') }}"
ControlPlaneDefaultRoute: "{{ undercloud_network_cidr|nthhost(1) }}"
EC2MetadataIp: "{{ undercloud_network_cidr|nthhost(1) }}"
DnsServers: "{{ overcloud_dns_servers }}"