Remove unused openshift_openstack_app_floating_ip

playbooks/openstack/sample-inventory/group_vars/all.yml

@@ -111,10 +111,9 @@ openshift_openstack_num_nodes: 2
 # # - by default, all roles are given Public IP addresses
 #openshift_openstack_master_floating_ip: true
 #openshift_openstack_infra_floating_ip: true
-#openshift_openstack_app_floating_ip: true
-#openshift_openstack_etcd_floating_ip: false
-#openshift_openstack_load_balancer_floating_ip: false
-#openshift_openstack_compute_floating_ip: false
+#openshift_openstack_etcd_floating_ip: true
+#openshift_openstack_load_balancer_floating_ip: true
+#openshift_openstack_compute_floating_ip: true
 
 # # Used Flavors
 # # - set specific flavors for roles by uncommenting corresponding lines

roles/openshift_openstack/defaults/main.yml

@@ -40,10 +40,9 @@ openshift_openstack_nsupdate_zone: "{{ openshift_openstack_full_dns_domain }}"
 # heat vars
 openshift_openstack_master_floating_ip: true
 openshift_openstack_infra_floating_ip: true
-openshift_openstack_app_floating_ip: true
+openshift_openstack_compute_floating_ip: true
 openshift_openstack_etcd_floating_ip: true
 openshift_openstack_load_balancer_floating_ip: true
-openshift_openstack_compute_floating_ip: true
 openshift_openstack_heat_template_version: pike
 openshift_openstack_clusterid: openshift
 openshift_openstack_stack_name: "openshift-cluster"

roles/openshift_openstack/templates/heat_stack.yaml.j2

@@ -43,7 +43,7 @@ outputs:
     description: IPs of the nodes
     value: { get_attr: [ compute_nodes, private_ip ] }
 
-{% if openshift_openstack_app_floating_ip | default(True) | bool %}
+{% if openshift_openstack_compute_floating_ip | default(True) | bool %}
   node_floating_ips:
     description: Floating IPs of the nodes
     value: { get_attr: [ compute_nodes, floating_ip ] }