Merge pull request #1325 from abutcher/fix-scaleup

Fix scaleup playbook.

playbooks/byo/openshift-cluster/cluster_hosts.yml

@@ -7,6 +7,8 @@ g_master_hosts: "{{ groups.masters | default([]) }}"
 
 g_node_hosts:   "{{ groups.nodes | default([]) }}"
 
+g_new_node_hosts: "{{ groups.new_nodes | default([]) }}"
+
 g_nfs_hosts:   "{{ groups.nfs | default([]) }}"
 
 g_all_hosts:    "{{ g_master_hosts | union(g_node_hosts) | union(g_etcd_hosts)

playbooks/common/openshift-cluster/evaluate_groups.yml

@@ -47,7 +47,7 @@
 
   # Use g_new_node_hosts if it exists otherwise g_node_hosts
   - set_fact:
-      g_node_hosts_to_config: "{{ g_new_node_hosts | default(g_node_hosts | default([])) }}"
+      g_node_hosts_to_config: "{{ g_new_node_hosts | default(g_node_hosts | default([], true), true) }}"
 
   - name: Evaluate oo_nodes_to_config
     add_host:

playbooks/common/openshift-node/config.yml

@@ -80,6 +80,7 @@
     when: etcd_client_flannel_certs_missing is defined and etcd_client_flannel_certs_missing
   roles:
   - role: etcd_certificates
+    when: openshift_use_flannel | default(false) | bool
   post_tasks:
   - name: Create a tarball of the etcd flannel certs
     command: >

roles/etcd_common/tasks/main.yml

@@ -5,9 +5,9 @@
 - fail:
     msg: "Interface {{ item.value.etcd_interface }} not found on host {{ item.key }}"
   when: "'etcd_interface' in item.value and 'interface' not in item.value"
-  with_dict: etcd_host_int_map
+  with_dict: etcd_host_int_map | default({})
 
 - fail:
     msg: IPv4 address not found for {{ item.value.interface.device }} on host {{ item.key }}
   when: "'ipv4' not in item.value.interface or 'address' not in item.value.interface.ipv4"
-  with_dict: etcd_host_int_map
+  with_dict: etcd_host_int_map | default({})