From 7d74d1913274cba4c4732cbc5f0a573cb99e5248 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Thu, 12 Feb 2015 11:26:56 -0700 Subject: - Rename minion to node - Update playbooks to support latest code --- playbooks/gce/openshift-node/config.yml | 55 +++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 playbooks/gce/openshift-node/config.yml (limited to 'playbooks/gce/openshift-node/config.yml') diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml new file mode 100644 index 000000000..1f201902f --- /dev/null +++ b/playbooks/gce/openshift-node/config.yml @@ -0,0 +1,55 @@ +- name: "populate oo_hosts_to_config host group if needed" + hosts: localhost + gather_facts: no + tasks: + - name: Evaluate oo_host_group_exp + add_host: "name={{ item }} groups=oo_hosts_to_config" + with_items: "{{ oo_host_group_exp | default('') }}" + when: oo_host_group_exp is defined + +- name: "Gather facts for masters in {{ oo_env }}" + hosts: "tag_env-host-type-{{ oo_env }}-openshift-master" + connection: ssh + user: root + +- name: "Set OO sepcific facts on localhost (for later use)" + hosts: localhost + gather_facts: no + tasks: + - name: Setting oo_master_ips fact on localhost + set_fact: + oo_master_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master']) + | oo_collect(attribute='ansible_eth0.ipv4.address') }}" + when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined + - name: Setting oo_master_public_ips fact on localhost + set_fact: + oo_master_public_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master']) + | oo_collect(attribute='gce_public_ip') }}" + when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined + +- name: "Debug hostvars" + hosts: oo_hosts_to_config + connection: ssh + user: root + tasks: + - debug: var=hostvars + +- name: "Configure instances" + hosts: oo_hosts_to_config + connection: ssh + user: root + vars_files: + - vars.yml + roles: + - ../../../roles/base_os + - ../../../roles/repos + - ../../../roles/docker + - { + role: ../../../roles/openshift_node, + oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", + oo_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}", + oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}", + oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" + } -- cgit v1.2.3 From 90010f6db6294a99c56194afd89a0359a3d278dc Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Mon, 16 Feb 2015 17:57:08 -0700 Subject: Update code to reflect review comments --- playbooks/gce/openshift-node/config.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'playbooks/gce/openshift-node/config.yml') diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml index 1f201902f..10016463b 100644 --- a/playbooks/gce/openshift-node/config.yml +++ b/playbooks/gce/openshift-node/config.yml @@ -1,6 +1,7 @@ - name: "populate oo_hosts_to_config host group if needed" hosts: localhost gather_facts: no + tasks: - name: Evaluate oo_host_group_exp add_host: "name={{ item }} groups=oo_hosts_to_config" @@ -29,17 +30,14 @@ | oo_collect(attribute='gce_public_ip') }}" when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined -- name: "Debug hostvars" - hosts: oo_hosts_to_config - connection: ssh - user: root - tasks: - - debug: var=hostvars - - name: "Configure instances" hosts: oo_hosts_to_config connection: ssh user: root + + vars: + tmp_dir: "/tmp/openshift-{{ 9999 | random }}" + vars_files: - vars.yml roles: @@ -51,5 +49,6 @@ oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", oo_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}", oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}", - oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" + oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}", + tmp_dir: "{{ tmp_dir }}" } -- cgit v1.2.3 From 16ab19a24e6e2122f3f1b8f229b8bb20c88045cd Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Tue, 17 Feb 2015 10:07:09 -0700 Subject: * Use hostname module * Use mktemp for scratch directory --- playbooks/gce/openshift-node/config.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'playbooks/gce/openshift-node/config.yml') diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml index 10016463b..c9cacbc63 100644 --- a/playbooks/gce/openshift-node/config.yml +++ b/playbooks/gce/openshift-node/config.yml @@ -34,10 +34,6 @@ hosts: oo_hosts_to_config connection: ssh user: root - - vars: - tmp_dir: "/tmp/openshift-{{ 9999 | random }}" - vars_files: - vars.yml roles: @@ -49,6 +45,5 @@ oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", oo_master_public_ips: "{{ hostvars['localhost'].oo_master_public_ips | default(['']) }}", oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}", - oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}", - tmp_dir: "{{ tmp_dir }}" + oo_public_ip: "{{ hostvars[inventory_hostname].ansible_ssh_host }}" } -- cgit v1.2.3