From 3e533e199aa9262f5ca45f8311e82e975cde73b9 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Fri, 1 May 2015 13:57:30 -0700
Subject: * Deploy services from common playbook

---
 playbooks/common/openshift-cluster/create_services.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 playbooks/common/openshift-cluster/create_services.yml

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-cluster/create_services.yml b/playbooks/common/openshift-cluster/create_services.yml
new file mode 100644
index 000000000..c85db5234
--- /dev/null
+++ b/playbooks/common/openshift-cluster/create_services.yml
@@ -0,0 +1,14 @@
+---
+- name: Debug Deploy OpenShift Services
+  hosts: localhost
+  gather_facts: no
+  tasks:
+  - debug: var=create_services__master
+
+- name: Deploy OpenShift Services
+  hosts: "{{ create_services__master }}"
+  connection: ssh
+  gather_facts: yes
+  roles:
+  - openshift_registry
+  - openshift_router
-- 
cgit v1.2.3


From 9873607d36f974114da1177451761ee053e38d71 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Fri, 29 May 2015 14:35:48 -0700
Subject: Install fluentd on nodes and master

* Configure fluentd to aggragate container logs
---
 playbooks/common/openshift-master/config.yml | 1 +
 playbooks/common/openshift-node/config.yml   | 1 +
 2 files changed, 2 insertions(+)

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 05822d118..2566f979e 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -6,6 +6,7 @@
   roles:
   - openshift_master
   - { role: openshift_sdn_master, when: openshift.common.use_openshift_sdn | bool }
+  - fluentd_master
   tasks:
   - name: Create group for deployment type
     group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 96641a274..b371312bc 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -96,6 +96,7 @@
   roles:
   - openshift_node
   - { role: openshift_sdn_node, when: openshift.common.use_openshift_sdn | bool }
+  - fluentd_node
   tasks:
   - name: Create group for deployment type
     group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}
-- 
cgit v1.2.3


From 205b22f62b91deebaf87c1e33c8f76631d8ce2d5 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Mon, 1 Jun 2015 10:40:08 -0700
Subject: * Make fluentd deployment optional with openshift_use_fluentd

---
 playbooks/common/openshift-master/config.yml | 2 +-
 playbooks/common/openshift-node/config.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 2566f979e..4df64e95f 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -6,7 +6,7 @@
   roles:
   - openshift_master
   - { role: openshift_sdn_master, when: openshift.common.use_openshift_sdn | bool }
-  - fluentd_master
+  - { role: fluentd_master, when openshift.common.use_fluentd | bool }
   tasks:
   - name: Create group for deployment type
     group_by: key=oo_masters_deployment_type_{{ openshift.common.deployment_type }}
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index b371312bc..70711e39b 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -96,7 +96,7 @@
   roles:
   - openshift_node
   - { role: openshift_sdn_node, when: openshift.common.use_openshift_sdn | bool }
-  - fluentd_node
+  - { role: fluentd_node, when: openshift.common.use_fluentd | bool }
   tasks:
   - name: Create group for deployment type
     group_by: key=oo_nodes_deployment_type_{{ openshift.common.deployment_type }}
-- 
cgit v1.2.3


From a2d9ea46fce456b2d4f890d6d321fa36e5cc6e2e Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Mon, 1 Jun 2015 11:49:22 -0700
Subject: * Rename create_services__master to g_svc_master

---
 playbooks/common/openshift-cluster/create_services.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'playbooks/common')

diff --git a/playbooks/common/openshift-cluster/create_services.yml b/playbooks/common/openshift-cluster/create_services.yml
index c85db5234..e70709d19 100644
--- a/playbooks/common/openshift-cluster/create_services.yml
+++ b/playbooks/common/openshift-cluster/create_services.yml
@@ -1,12 +1,6 @@
 ---
-- name: Debug Deploy OpenShift Services
-  hosts: localhost
-  gather_facts: no
-  tasks:
-  - debug: var=create_services__master
-
 - name: Deploy OpenShift Services
-  hosts: "{{ create_services__master }}"
+  hosts: "{{ g_svc_master }}"
   connection: ssh
   gather_facts: yes
   roles:
-- 
cgit v1.2.3