From f929f3f94c7c89e40f9c8e2b85293f496101aebe Mon Sep 17 00:00:00 2001 From: Akram Ben Aissi Date: Thu, 11 Dec 2014 13:52:16 +0100 Subject: Adding AWS support to openshift-ansible module - Update documentation to say that ssh configuration need to point to the private key file - Removing the -p argument when calling time .... because it is misintrepreted by ruby - Turning the cluster.sh to agnostic in its help/error message by replacing explicit reference to GCE by a a variable - Fixing a bug within the playbooks that incorrectly references the minions and master fact group. - Adding playbooks for AWS, which are almost of copy/paste for those of GCE - Added environment variable OO_PROVIDER to allow definition of the provider. Defaults is gce - TODO implement the terminate.yml cookbook --- playbooks/aws/openshift-master/config.yml | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 playbooks/aws/openshift-master/config.yml (limited to 'playbooks/aws/openshift-master/config.yml') diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml new file mode 100644 index 000000000..c8345aa2c --- /dev/null +++ b/playbooks/aws/openshift-master/config.yml @@ -0,0 +1,40 @@ +- name: "populate oo_hosts_to_config host group if needed" + hosts: localhost + gather_facts: no + tasks: + - name: Evaluate oo_host_group_exp if it's set + 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 minions in {{ oo_env }}" + hosts: "tag_env-host-type_{{ oo_env }}-openshift-minion" + connection: ssh + user: root + +- name: "Set Origin specific facts on localhost (for later use)" + hosts: localhost + gather_facts: no + tasks: + - name: Setting oo_minion_ips fact on localhost + set_fact: + oo_minion_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type_' + oo_env + '-openshift-minion']) + | oo_collect(attribute='ansible_eth0.ipv4.address') }}" + when: groups['tag_env-host-type_' + oo_env + '-openshift-minion'] is defined + +- name: "Configure instances" + hosts: oo_hosts_to_config + connection: ssh + user: root + vars_files: + - vars.yml + roles: + - ../../../roles/base_os + - ../../../roles/repos + - { + role: ../../../roles/openshift_master, + oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}", + oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}" + } + - ../../../roles/pods -- cgit v1.2.3