From 114fcaac2a8f8e3d68baf8945f8991b1da9763ee Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Tue, 17 Feb 2015 17:18:20 -0500
Subject: add symlinks for filter_plugins and roles to playbook directories

- allows playbooks to be able to discover roles and filter_plugins without
  having to manipulate the environment or use relative paths.
---
 playbooks/gce/openshift-node/config.yml     | 8 ++++----
 playbooks/gce/openshift-node/filter_plugins | 1 +
 playbooks/gce/openshift-node/roles          | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 120000 playbooks/gce/openshift-node/filter_plugins
 create mode 120000 playbooks/gce/openshift-node/roles

(limited to 'playbooks/gce/openshift-node')

diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index c9cacbc63..dcf5d4f94 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -37,11 +37,11 @@
   vars_files:
     - vars.yml
   roles:
-    - ../../../roles/base_os
-    - ../../../roles/repos
-    - ../../../roles/docker
+    - base_os
+    - repos
+    - docker
     - {
-        role: ../../../roles/openshift_node,
+        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(['']) }}",
diff --git a/playbooks/gce/openshift-node/filter_plugins b/playbooks/gce/openshift-node/filter_plugins
new file mode 120000
index 000000000..99a95e4ca
--- /dev/null
+++ b/playbooks/gce/openshift-node/filter_plugins
@@ -0,0 +1 @@
+../../../filter_plugins
\ No newline at end of file
diff --git a/playbooks/gce/openshift-node/roles b/playbooks/gce/openshift-node/roles
new file mode 120000
index 000000000..20c4c58cf
--- /dev/null
+++ b/playbooks/gce/openshift-node/roles
@@ -0,0 +1 @@
+../../../roles
\ No newline at end of file
-- 
cgit v1.2.3


From 4ac06057c9a77626bb181c22a5f1adc8014b13d2 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Tue, 17 Feb 2015 22:33:33 -0500
Subject: 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
---
 playbooks/gce/openshift-node/config.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'playbooks/gce/openshift-node')

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 }}",
       }
-- 
cgit v1.2.3