Merge pull request #10040 from tzumainn/openstack-fix-parameter-checks

Fix OpenStack parameter checks

roles/openshift_openstack/tasks/check-prerequisites.yml

@@ -79,19 +79,19 @@
   os_subnets_facts:
     name: "{{ openshift_openstack_node_subnet_name }}"
   register: subnet_result
-  when: openshift_openstack_node_subnet_name is defined
+  when: openshift_openstack_node_subnet_name is defined and openshift_openstack_node_subnet_name
 - name: Set custom network id
   set_fact:
     openshift_openstack_node_network_id: "{{ subnet_result.ansible_facts.openstack_subnets[0].network_id }}"
-  when: openshift_openstack_node_subnet_name is defined
+  when: openshift_openstack_node_subnet_name is defined and openshift_openstack_node_subnet_name
 - name: Set custom subnet id
   set_fact:
     openshift_openstack_node_subnet_id: "{{ subnet_result.ansible_facts.openstack_subnets[0].id }}"
-  when: openshift_openstack_node_subnet_name is defined
+  when: openshift_openstack_node_subnet_name is defined and openshift_openstack_node_subnet_name
 - name: Set custom subnet cidr
   set_fact:
     openshift_openstack_subnet_cidr: "{{ subnet_result.ansible_facts.openstack_subnets[0].cidr }}"
-  when: openshift_openstack_node_subnet_name is defined
+  when: openshift_openstack_node_subnet_name is defined and openshift_openstack_node_subnet_name
 
 # TODO ltomasbo: there is no Ansible module for getting router facts
 - name: Get custom router id
@@ -99,11 +99,11 @@
            python -c 'import shade; cloud = shade.openstack_cloud();
            print cloud.get_router("{{ openshift_openstack_router_name }}").id'
   register: router_info
-  when: openshift_openstack_router_name is defined
+  when: openshift_openstack_router_name is defined and openshift_openstack_router_name
 - name: Set custom router id
   set_fact:
     openshift_openstack_router_id: "{{ router_info.stdout }}"
-  when: openshift_openstack_router_name is defined
+  when: openshift_openstack_router_name is defined and openshift_openstack_router_name
 
 # Check keypair
 # TODO kpilatov: there is no Ansible module for getting OS keypairs

roles/openshift_openstack/tasks/provision.yml

@@ -59,7 +59,7 @@
   ignore_errors: True
   register: stack_create
   until: stack_create is not failed
-  retries: 20
+  retries: 5
   delay: 5
   os_stack:
     name: "{{ openshift_openstack_stack_name }}"

roles/openshift_openstack/templates/heat_stack.yaml.j2

@@ -643,7 +643,7 @@ resources:
           net:         {{ openshift_openstack_provider_network_name }}
           net_name:         {{ openshift_openstack_provider_network_name }}
 {% else %}
-{% if openshift_openstack_node_network_id %}
+{% if openshift_openstack_node_network_id|default(false) %}
           net:         {{ openshift_openstack_node_network_id }}
 {% else %}
           net:         { get_resource: net }
@@ -727,7 +727,7 @@ resources:
 {% if openshift_openstack_provider_network_name %}
           net:         {{ openshift_openstack_provider_network_name }}
           net_name:         {{ openshift_openstack_provider_network_name }}
-{% elif openshift_openstack_node_network_id %}
+{% elif openshift_openstack_node_network_id|default(false) %}
           net:         {{ openshift_openstack_node_network_id }}
 {% else %}
           net:         { get_resource: net }
@@ -801,7 +801,7 @@ resources:
           net:         {{ openshift_openstack_provider_network_name }}
           net_name:         {{ openshift_openstack_provider_network_name }}
 {% else %}
-{% if openshift_openstack_node_network_id %}
+{% if openshift_openstack_node_network_id|default(false) %}
           net:         {{ openshift_openstack_node_network_id }}
 {% else %}
           net:         { get_resource: net }
@@ -895,7 +895,7 @@ resources:
           net:         {{ openshift_openstack_provider_network_name }}
           net_name:         {{ openshift_openstack_provider_network_name }}
 {% else %}
-{% if openshift_openstack_node_network_id %}
+{% if openshift_openstack_node_network_id|default(false) %}
           net:         {{ openshift_openstack_node_network_id }}
 {% else %}
           net:         { get_resource: net }
@@ -976,7 +976,7 @@ resources:
           net:         {{ openshift_openstack_provider_network_name }}
           net_name:         {{ openshift_openstack_provider_network_name }}
 {% else %}
-{% if openshift_openstack_node_network_id %}
+{% if openshift_openstack_node_network_id|default(false) %}
           net:         {{ openshift_openstack_node_network_id }}
 {% else %}
           net:         { get_resource: net }
@@ -1062,7 +1062,7 @@ resources:
           net:         {{ openshift_openstack_provider_network_name }}
           net_name:    {{ openshift_openstack_provider_network_name }}
 {% else %}
-{% if openshift_openstack_node_network_id %}
+{% if openshift_openstack_node_network_id|default(false) %}
           net:         {{ openshift_openstack_node_network_id }}
 {% else %}
           net:         { get_resource: net }