summaryrefslogtreecommitdiffstats
path: root/playbooks/gce
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-02-17 22:33:33 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-02-24 23:10:37 -0500
commit4ac06057c9a77626bb181c22a5f1adc8014b13d2 (patch)
treec8ab69e2e65de32d2f29771fb47fcce78fe5dd04 /playbooks/gce
parent114fcaac2a8f8e3d68baf8945f8991b1da9763ee (diff)
downloadopenshift-4ac06057c9a77626bb181c22a5f1adc8014b13d2.tar.gz
openshift-4ac06057c9a77626bb181c22a5f1adc8014b13d2.tar.bz2
openshift-4ac06057c9a77626bb181c22a5f1adc8014b13d2.tar.xz
openshift-4ac06057c9a77626bb181c22a5f1adc8014b13d2.zip
create openshift_common role
- move common openshift logic into openshift_common - set openshift_common as a dependency for openshift_node and openshift_master - rename role variables to openshift_* to be more descriptive - start recording local_facts on the openshift hosts - clean up firewalld config to be a bit more dry - Update firewall ports for https, make sure http rules are removed - Replace references to ansible_eth0.ipv4.address with ansible_default_ipv4.address
Diffstat (limited to 'playbooks/gce')
-rw-r--r--playbooks/gce/openshift-master/config.yml13
-rw-r--r--playbooks/gce/openshift-node/config.yml20
2 files changed, 17 insertions, 16 deletions
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml
index fa5649306..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"
@@ -34,8 +35,8 @@
- repos
- {
role: 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 }}"
+ openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}",
+ openshift_public_ip: "{{ gce_public_ip }}",
+ openshift_env: "{{ oo_env }}",
}
- pods
diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index dcf5d4f94..adfad5d7e 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -1,7 +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"
@@ -17,15 +17,15 @@
hosts: localhost
gather_facts: no
tasks:
- - name: Setting oo_master_ips fact on localhost
+ - name: Setting openshift_master_ips fact on localhost
set_fact:
- oo_master_ips: "{{ hostvars
+ openshift_master_ips: "{{ hostvars
| oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-master'])
- | oo_collect(attribute='ansible_eth0.ipv4.address') }}"
+ | oo_collect(attribute='ansible_default_ipv4.address') }}"
when: groups['tag_env-host-type-' + oo_env + '-openshift-master'] is defined
- - name: Setting oo_master_public_ips fact on localhost
+ - name: Setting openshift_master_public_ips fact on localhost
set_fact:
- oo_master_public_ips: "{{ hostvars
+ openshift_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
@@ -42,8 +42,8 @@
- docker
- {
role: 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 }}"
+ openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}",
+ openshift_master_public_ips: "{{ hostvars['localhost'].openshift_master_public_ips | default(['']) }}",
+ openshift_public_ip: "{{ gce_public_ip }}",
+ openshift_env: "{{ oo_env }}",
}