From 1b4526d677651cb3677cbf7cc687a76fcba47c9a Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Mon, 27 Apr 2015 15:04:57 -0700
Subject: [WIP] Infrastructure - Deploy services in cluster

* Create OpenShift Docker Registry
* Create OpenShift router
---
 playbooks/gce/openshift-cluster/launch.yml | 15 +++++++++++++++
 playbooks/gce/openshift-cluster/list.yml   |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

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

diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
index 771f51e91..36fc430aa 100644
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ b/playbooks/gce/openshift-cluster/launch.yml
@@ -23,6 +23,21 @@
       cluster: "{{ cluster_id }}"
       type: "{{ k8s_type }}"
 
+  - set_fact:
+      oo_first_master: "{{ item }}"
+    with_items: master_names.split()
+  - debug: var=oo_first_master
+
 - include: update.yml
 
+- name: Deploy OpenShift Services
+  hosts: oo_first_master
+  connection: ssh
+  gather_facts: yes
+  vars_files:
+  - vars.yml
+  roles:
+  - openshift_docker_registry
+  - openshift_router
+
 - include: list.yml
diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml
index 962381306..5ba0f5a48 100644
--- a/playbooks/gce/openshift-cluster/list.yml
+++ b/playbooks/gce/openshift-cluster/list.yml
@@ -16,7 +16,7 @@
       ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
     with_items: groups[scratch_group] | default([]) | difference(['localhost']) | difference(groups.status_terminated)
 
-- name: List Hosts
+- name: List instance(s)
   hosts: oo_list_hosts
   gather_facts: no
   tasks:
-- 
cgit v1.2.3


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/gce/openshift-cluster/launch.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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

diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
index 36fc430aa..53d461183 100644
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ b/playbooks/gce/openshift-cluster/launch.yml
@@ -24,20 +24,21 @@
       type: "{{ k8s_type }}"
 
   - set_fact:
-      oo_first_master: "{{ item }}"
-    with_items: master_names.split()
-  - debug: var=oo_first_master
+      a_master: "{{ master_names[0] }}"
+  - add_host: name={{ a_master }} groups=service_master
 
 - include: update.yml
 
 - name: Deploy OpenShift Services
-  hosts: oo_first_master
+  hosts: service_master
   connection: ssh
   gather_facts: yes
-  vars_files:
-  - vars.yml
   roles:
-  - openshift_docker_registry
+  - openshift_registry
   - openshift_router
 
+- include: ../../common/openshift-cluster/create_services.yml
+  vars:
+     create_services__master: "{{ service_master }}"
+
 - include: list.yml
-- 
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/gce/openshift-cluster/launch.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
index 53d461183..35737f03d 100644
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ b/playbooks/gce/openshift-cluster/launch.yml
@@ -39,6 +39,6 @@
 
 - include: ../../common/openshift-cluster/create_services.yml
   vars:
-     create_services__master: "{{ service_master }}"
+     g_svc_master: "{{ service_master }}"
 
 - include: list.yml
-- 
cgit v1.2.3