diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-05-25 09:54:36 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-05-25 09:54:36 -0400 |
| commit | 00eba039c9312fbd04cc05a8a890ef48f2311769 (patch) | |
| tree | 3ad1665eb4731687c5b8cdcafde9ce00aefe3865 /playbooks/libvirt/openshift-cluster | |
| parent | 82d3a4bac81d67d8575279fe99352700d65ca7f6 (diff) | |
| parent | 4f4c4f038f4df910a33c0c1ab3bc8b2179f4a764 (diff) | |
| download | openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.tar.gz openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.tar.bz2 openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.tar.xz openshift-00eba039c9312fbd04cc05a8a890ef48f2311769.zip | |
Merge pull request #1773 from detiber/aws_cleanup
Cloud provider cleanup
Diffstat (limited to 'playbooks/libvirt/openshift-cluster')
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/config.yml | 20 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/update.yml | 18 |
2 files changed, 34 insertions, 4 deletions
diff --git a/playbooks/libvirt/openshift-cluster/config.yml b/playbooks/libvirt/openshift-cluster/config.yml index 81a6fff0d..032d4cf68 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..28362c984 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 @@ -14,7 +30,7 @@ groups: oo_hosts_to_update ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" ansible_become: "{{ deployment_vars[deployment_type].become }}" - with_items: "{{ g_all_hosts | default([]) }}" + with_items: g_all_hosts | default([]) - include: ../../common/openshift-cluster/update_repos_and_packages.yml |