diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-04-21 00:45:28 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-05-05 21:23:19 -0400 |
| commit | 866bab53db58352d56e33b8d97ce3b982a850cb9 (patch) | |
| tree | 952e38c88c3f39a2ea7d98eafb17b85889d9a974 /playbooks/aws/openshift-cluster/config.yml | |
| parent | e4c7c26436d4daf2cbccd54bc91cb5f3471c3dc0 (diff) | |
| download | openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.tar.gz openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.tar.bz2 openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.tar.xz openshift-866bab53db58352d56e33b8d97ce3b982a850cb9.zip | |
aws provider fixes
- fix errors in userdata template
- update origin centos ami
- ensure ec2_tag_sub-host-type is set after launch
- disable openshift_use_dnsmasq for now
- Remove use of vars_files in includes
Diffstat (limited to 'playbooks/aws/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index 8402b3579..c249f2963 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -1,7 +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 + - include: ../../common/openshift-cluster/config.yml - vars_files: - - ../../aws/openshift-cluster/vars.yml - - ../../aws/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 |