diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-02-27 09:23:43 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-02-27 09:23:43 -0500 |
| commit | 98d53c4119170bf87e635207152ac180a5420e21 (patch) | |
| tree | 4c91c670d915a1f6e2ca933756a8b64b45dbb237 /playbooks/gce/openshift-master | |
| parent | 50f53296253953fb2d3fff6bd7d7d3e538b9430b (diff) | |
| parent | 20b2f13b0a7b7aa87804a0d7d861dfe68f715928 (diff) | |
| download | openshift-98d53c4119170bf87e635207152ac180a5420e21.tar.gz openshift-98d53c4119170bf87e635207152ac180a5420e21.tar.bz2 openshift-98d53c4119170bf87e635207152ac180a5420e21.tar.xz openshift-98d53c4119170bf87e635207152ac180a5420e21.zip | |
Merge pull request #82 from detiber/commonRole
create openshift-common role
Diffstat (limited to 'playbooks/gce/openshift-master')
| -rw-r--r-- | playbooks/gce/openshift-master/config.yml | 21 | ||||
| l--------- | playbooks/gce/openshift-master/filter_plugins | 1 | ||||
| l--------- | playbooks/gce/openshift-master/roles | 1 |
3 files changed, 13 insertions, 10 deletions
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml index cfdb5bbbe..1c7dea3ca 100644 --- a/playbooks/gce/openshift-master/config.yml +++ b/playbooks/gce/openshift-master/config.yml @@ -1,3 +1,4 @@ +--- - name: "populate oo_hosts_to_config host group if needed" hosts: localhost gather_facts: no @@ -16,11 +17,11 @@ hosts: localhost gather_facts: no tasks: - - name: Setting oo_node_ips fact on localhost + - name: Setting openshift_node_ips fact on localhost set_fact: - oo_node_ips: "{{ hostvars + openshift_node_ips: "{{ hostvars | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-node']) - | oo_collect(attribute='ansible_eth0.ipv4.address') }}" + | oo_collect(attribute='ansible_default_ipv4.address') }}" when: groups['tag_env-host-type-' + oo_env + '-openshift-node'] is defined - name: "Configure instances" @@ -30,12 +31,12 @@ vars_files: - vars.yml roles: - - ../../../roles/base_os - - ../../../roles/repos + - base_os + - repos - { - role: ../../../roles/openshift_master, - oo_node_ips: "{{ hostvars['localhost'].oo_node_ips | default(['']) }}", - oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}", - oo_public_ip: "{{ gce_public_ip }}" + role: openshift_master, + openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}", + openshift_public_ip: "{{ gce_public_ip }}", + openshift_env: "{{ oo_env }}", } - - ../../../roles/pods + - pods diff --git a/playbooks/gce/openshift-master/filter_plugins b/playbooks/gce/openshift-master/filter_plugins new file mode 120000 index 000000000..99a95e4ca --- /dev/null +++ b/playbooks/gce/openshift-master/filter_plugins @@ -0,0 +1 @@ +../../../filter_plugins
\ No newline at end of file diff --git a/playbooks/gce/openshift-master/roles b/playbooks/gce/openshift-master/roles new file mode 120000 index 000000000..20c4c58cf --- /dev/null +++ b/playbooks/gce/openshift-master/roles @@ -0,0 +1 @@ +../../../roles
\ No newline at end of file |