diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-02 15:25:27 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-02 15:25:27 -0500 |
| commit | fda67ef2addee2cb4cb982c8b9e0eb13bcf9ff7e (patch) | |
| tree | a2d846e9bc37dc9220b49ffec06b716eb360d8a8 /playbooks | |
| parent | ff8f2013a8dde61bc8fe57c545c716b9a3dc4098 (diff) | |
| parent | 8729ef23ff37a51a8c13a825e740171bbeed0031 (diff) | |
| download | openshift-fda67ef2addee2cb4cb982c8b9e0eb13bcf9ff7e.tar.gz openshift-fda67ef2addee2cb4cb982c8b9e0eb13bcf9ff7e.tar.bz2 openshift-fda67ef2addee2cb4cb982c8b9e0eb13bcf9ff7e.tar.xz openshift-fda67ef2addee2cb4cb982c8b9e0eb13bcf9ff7e.zip | |
Merge pull request #1325 from abutcher/fix-scaleup
Fix scaleup playbook.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/byo/openshift-cluster/cluster_hosts.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/evaluate_groups.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/playbooks/byo/openshift-cluster/cluster_hosts.yml b/playbooks/byo/openshift-cluster/cluster_hosts.yml index e093b2580..10872e738 100644 --- a/playbooks/byo/openshift-cluster/cluster_hosts.yml +++ b/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) diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml index db7105ed5..7917bfba5 100644 --- a/playbooks/common/openshift-cluster/evaluate_groups.yml +++ b/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: diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 81ec9ab6d..e07de0e99 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/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: > |