diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-04-29 17:21:45 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-05 21:23:19 -0400 |
| commit | 7669dc981239c8401ef4971856f00c329c09fe6c (patch) | |
| tree | 830b81bb1665f9005808bb327c822afb99dd0c23 /playbooks | |
| parent | ed869237f676a6a68df83cc6a379110ab6a91770 (diff) | |
| download | openshift-7669dc981239c8401ef4971856f00c329c09fe6c.tar.gz openshift-7669dc981239c8401ef4971856f00c329c09fe6c.tar.bz2 openshift-7669dc981239c8401ef4971856f00c329c09fe6c.tar.xz openshift-7669dc981239c8401ef4971856f00c329c09fe6c.zip | |
libvirt_fixes
- disable openshift_use_dnsmasq for libvirt
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/config.yml | 20 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/update.yml | 16 |
2 files changed, 33 insertions, 3 deletions
diff --git a/playbooks/libvirt/openshift-cluster/config.yml b/playbooks/libvirt/openshift-cluster/config.yml index 81a6fff0d..cfd3e4d53 100644 --- a/playbooks/libvirt/openshift-cluster/config.yml +++ b/playbooks/libvirt/openshift-cluster/config.yml @@ -2,10 +2,23 @@ # TODO: need to figure out a plan for setting hostname, currently the default # is localhost, so no hostname value (or public_hostname) value is getting # assigned +- hosts: localhost + gather_facts: no + tasks: + - include_vars: vars.yml + - include_vars: cluster_hosts.yml + - add_host: + name: "{{ item }}" + groups: l_oo_all_hosts + with_items: "{{ g_all_hosts }}" + +- hosts: l_oo_all_hosts + gather_facts: no + tasks: + - include_vars: vars.yml + - include_vars: cluster_hosts.yml + - include: ../../common/openshift-cluster/config.yml - vars_files: - - ../../libvirt/openshift-cluster/vars.yml - - ../../libvirt/openshift-cluster/cluster_hosts.yml vars: g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" g_sudo: "{{ deployment_vars[deployment_type].become }}" @@ -21,3 +34,4 @@ os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}" openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}" openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}" + openshift_use_dnsmasq: false diff --git a/playbooks/libvirt/openshift-cluster/update.yml b/playbooks/libvirt/openshift-cluster/update.yml index 9b7a2777a..94cda9bb2 100644 --- a/playbooks/libvirt/openshift-cluster/update.yml +++ b/playbooks/libvirt/openshift-cluster/update.yml @@ -1,4 +1,20 @@ --- +- hosts: localhost + gather_facts: no + tasks: + - include_vars: vars.yml + - include_vars: cluster_hosts.yml + - add_host: + name: "{{ item }}" + groups: l_oo_all_hosts + with_items: "{{ g_all_hosts }}" + +- hosts: l_oo_all_hosts + gather_facts: no + tasks: + - include_vars: vars.yml + - include_vars: cluster_hosts.yml + - name: Populate oo_hosts_to_update group hosts: localhost connection: local |