diff options
| author | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 10:16:20 -0500 |
|---|---|---|
| committer | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 10:16:20 -0500 |
| commit | 41ad58a9b9cd59eb5d8bece20d0c1073190d67b4 (patch) | |
| tree | 7f11cf6a031a5c8b0efe9618c7ec3476c39fcbb8 /playbooks/gce/openshift-master | |
| parent | f780d4fa01a1e8b1559d31a7065715317a884ec4 (diff) | |
| parent | 0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db (diff) | |
| download | openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.gz openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.bz2 openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.xz openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.zip | |
Merge branch 'master' into tower_install
Conflicts:
lib/aws_command.rb
Diffstat (limited to 'playbooks/gce/openshift-master')
| -rw-r--r-- | playbooks/gce/openshift-master/config.yml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml index f705bb305..cfdb5bbbe 100644 --- a/playbooks/gce/openshift-master/config.yml +++ b/playbooks/gce/openshift-master/config.yml @@ -7,8 +7,8 @@ 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" +- name: "Gather facts for nodes in {{ oo_env }}" + hosts: "tag_env-host-type-{{ oo_env }}-openshift-node" connection: ssh user: root @@ -16,12 +16,12 @@ hosts: localhost gather_facts: no tasks: - - name: Setting oo_minion_ips fact on localhost + - name: Setting oo_node_ips fact on localhost set_fact: - oo_minion_ips: "{{ hostvars - | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-minion']) + oo_node_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-node']) | oo_collect(attribute='ansible_eth0.ipv4.address') }}" - when: groups['tag_env-host-type-' + oo_env + '-openshift-minion'] is defined + when: groups['tag_env-host-type-' + oo_env + '-openshift-node'] is defined - name: "Configure instances" hosts: oo_hosts_to_config @@ -34,7 +34,8 @@ - ../../../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(['']) }}" + 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 }}" } - ../../../roles/pods |