summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-master
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-02-12 11:26:56 -0700
committerJhon Honce <jhonce@redhat.com>2015-02-16 15:53:18 -0700
commit7d74d1913274cba4c4732cbc5f0a573cb99e5248 (patch)
tree91b943f553a4d37673e0dd32647528b4cd89ad1f /playbooks/gce/openshift-master
parent65e50b4dd338a4757a2bfb883d34d803350c3aae (diff)
downloadopenshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.gz
openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.bz2
openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.xz
openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.zip
- Rename minion to node
- Update playbooks to support latest code
Diffstat (limited to 'playbooks/gce/openshift-master')
-rw-r--r--playbooks/gce/openshift-master/config.yml17
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