diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2015-09-22 16:42:36 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-05 11:38:27 -0500 |
| commit | ca9f4f08fbf14f9edfa7331e327cf92a25cd4401 (patch) | |
| tree | 1be3bf26a63c9b20012717e0da8bf6fea2720ae7 /playbooks/common/openshift-cluster | |
| parent | 6571fd9d220b7cc67ae5738149164104d5662902 (diff) | |
| download | openshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.tar.gz openshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.tar.bz2 openshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.tar.xz openshift-ca9f4f08fbf14f9edfa7331e327cf92a25cd4401.zip | |
Various HA changes for pacemaker and native methods.
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 10 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/evaluate_groups.yml | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index b66ca4709..a8bd634d3 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -1,14 +1,6 @@ --- - include: evaluate_groups.yml - - name: Evaluate oo_lb_to_config - add_host: - name: "{{ item }}" - groups: oo_lb_to_config - ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" - ansible_sudo: "{{ g_sudo | default(omit) }}" - with_items: groups[g_lb_group] | default(groups[g_masters_group]) | default([]) - - include: ../openshift-etcd/config.yml - include: ../openshift-master/config.yml @@ -16,4 +8,4 @@ - include: ../openshift-node/config.yml vars: osn_cluster_dns_domain: "{{ hostvars[groups.oo_first_master.0].openshift.dns.domain }}" - osn_cluster_dns_ip: "{{ hostvars[groups.oo_first_master.0].openshift.dns.ip }}" + osn_cluster_dns_ip: "{{ hostvars[groups.oo_first_master.0].cluster_dns_ip }}" diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml index 1919660dd..a787ba0d3 100644 --- a/playbooks/common/openshift-cluster/evaluate_groups.yml +++ b/playbooks/common/openshift-cluster/evaluate_groups.yml @@ -62,3 +62,11 @@ ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" ansible_sudo: "{{ g_sudo | default(omit) }}" when: g_masters_group in groups and (groups[g_masters_group] | length) > 0 + + - name: Evaluate oo_lb_to_config + add_host: + name: "{{ item }}" + groups: oo_lb_to_config + ansible_ssh_user: "{{ g_ssh_user | default(omit) }}" + ansible_sudo: "{{ g_sudo | default(omit) }}" + with_items: groups[g_lb_group] | default([]) |