From 866bab53db58352d56e33b8d97ce3b982a850cb9 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Thu, 21 Apr 2016 00:45:28 -0400 Subject: 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 --- playbooks/aws/openshift-cluster/config.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'playbooks/aws/openshift-cluster/config.yml') 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 -- cgit v1.2.3 From 432b3d970cbf22715b5f9349863ab5a396c64d2f Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Thu, 5 May 2016 21:29:04 -0400 Subject: g_all_hosts with templated with_items causes errors with ansible 1.9.4 under some conditions --- playbooks/aws/openshift-cluster/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'playbooks/aws/openshift-cluster/config.yml') diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index c249f2963..4839c100b 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -6,7 +6,7 @@ - add_host: name: "{{ item }}" groups: l_oo_all_hosts - with_items: "{{ g_all_hosts }}" + with_items: g_all_hosts - hosts: l_oo_all_hosts gather_facts: no -- cgit v1.2.3