extras-common: add undercloud_network_cidr as common var

add role var undercloud_network_cidr from undercloud-deploy so it can be
reused by validate-undercloud role for the sanity check script
Removed unnecessary default from other roles.

Change-Id: Id46d7a9e3fdc2028cf345564311c04af323b289f

roles/extras-common/defaults/main.yml

@@ -4,3 +4,4 @@ overcloud_ipv6: false
 containerized_overcloud: false
 overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 enable_tls_everywhere: false
+undercloud_network_cidr: 192.168.24.0/24

roles/overcloud-deploy/defaults/main.yml

@@ -20,7 +20,7 @@ composable_scenario: ""
 # change any of the related variables.
 #
 # [ipaddr]: http://docs.ansible.com/ansible/playbooks_filters_ipaddr.html
-floating_ip_cidr: "{{ undercloud_network_cidr|default('192.0.2.0/24') }}"
+floating_ip_cidr: "{{ undercloud_network_cidr }}"
 floating_ip_start: "{{ floating_ip_cidr|nthhost(100) }}"
 floating_ip_end: "{{ floating_ip_cidr|nthhost(120) }}"
 external_network_gateway: "{{ floating_ip_cidr|nthhost(1) }}"

roles/overcloud-prep-config/defaults/main.yml

@@ -6,7 +6,6 @@ network_environment_file: network-environment.yaml.j2
 
 external_network_cidr: 192.168.23.0/24
 undercloud_external_network_cidr: 10.0.0.1/24
-undercloud_network_cidr: 192.168.24.0/24
 overcloud_dns_servers: [ '{{ external_network_cidr|nthhost(1) }}' ]
 
 overcloud_public_vip: 10.0.0.5

roles/overcloud-prep-containers/defaults/main.yml

@@ -5,6 +5,5 @@ containerized_overcloud: false
 overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
 containers_default_parameters: container-default-parameters.yaml.j2
 overcloud_prep_containers_log: overcloud_prep_containers.log
-undercloud_network_cidr: 192.168.24.0/24
 ctl_plane_ip: "{{undercloud_network_gateway|default(undercloud_network_cidr|nthhost(1))}}"
 containers_compute_dns_server: 8.8.8.8

roles/overcloud-prep-network/defaults/main.yml

@@ -2,5 +2,3 @@
 
 overcloud_prep_network_script: overcloud-prep-network.sh.j2
 overcloud_prep_network_log: "{{ working_dir }}/overcloud_prep_network.log"
-
-undercloud_network_cidr: 192.168.24.0/24

roles/undercloud-deploy/defaults/main.yml

@@ -6,8 +6,6 @@ undercloud_install_log: "{{ working_dir }}/undercloud_install.log"
 network_environment_file: network-environment.yaml.j2
 undercloud_hieradata_override_file: quickstart-hieradata-overrides.yaml.j2
 
-undercloud_network_cidr: 192.168.24.0/24
-
 step_introspect: false
 bash_deploy_ramdisk: false
 step_install_undercloud: true

roles/undercloud-deploy/tasks/main.yml

@@ -37,4 +37,3 @@
 - include: post-install.yml
   tags:
     - undercloud-post-install
-

roles/validate-ha/defaults/main.yml

@@ -7,7 +7,8 @@ environment_file: environment.j2
 apply_workarounds: false
 workarounds_script: workarounds.sh.j2
 
-floating_ip_cidr: "{{ undercloud_network_cidr|default('192.0.2.0/24') }}"
+
+floating_ip_cidr: "{{ undercloud_network_cidr }}"
 floating_ip_start: "{{ floating_ip_cidr|nthhost(100) }}"
 floating_ip_end: "{{ floating_ip_cidr|nthhost(120) }}"
 external_network_gateway: "{{ floating_ip_cidr|nthhost(1) }}"

roles/validate-simple/defaults/main.yml

@@ -13,7 +13,7 @@ image_kernel: cirros-0.3.4-x86_64-kernel
 validate_image_name: pingtest_image
 validate_image_dir: "{{ working_dir }}/cirros_images"
 release: mitaka
-floating_ip_cidr: "{{ undercloud_network_cidr|default('192.168.24.0/24') }}"
+floating_ip_cidr: "{{ undercloud_network_cidr }}"
 public_net_name: nova
 public_net_type: flat
 public_net_pool_start: "{{ floating_ip_cidr|nthhost(100) }}"

roles/validate-tempest/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 
 configure_tempest: true
-floating_ip_cidr: "{{ undercloud_network_cidr|default('192.168.24.0/24') }}"
+floating_ip_cidr: "{{ undercloud_network_cidr }}"
 public_net_pool_start: "{{ floating_ip_cidr|nthhost(100) }}"
 public_net_pool_end: "{{ floating_ip_cidr|nthhost(120) }}"
 public_net_gateway: "{{ floating_ip_cidr|nthhost(1) }}"