summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-05-01 13:57:30 -0700
committerJhon Honce <jhonce@redhat.com>2015-05-29 14:36:56 -0700
commit3e533e199aa9262f5ca45f8311e82e975cde73b9 (patch)
treec9ce290ee05b408aa4209c9ebeaecfacb84acd12 /playbooks
parent1b4526d677651cb3677cbf7cc687a76fcba47c9a (diff)
downloadopenshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.tar.gz
openshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.tar.bz2
openshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.tar.xz
openshift-3e533e199aa9262f5ca45f8311e82e975cde73b9.zip
* Deploy services from common playbook
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/aws/openshift-cluster/launch.yml8
-rw-r--r--playbooks/common/openshift-cluster/create_services.yml14
-rw-r--r--playbooks/gce/openshift-cluster/launch.yml15
3 files changed, 30 insertions, 7 deletions
diff --git a/playbooks/aws/openshift-cluster/launch.yml b/playbooks/aws/openshift-cluster/launch.yml
index 3eb5496e4..f64925124 100644
--- a/playbooks/aws/openshift-cluster/launch.yml
+++ b/playbooks/aws/openshift-cluster/launch.yml
@@ -25,6 +25,14 @@
cluster: "{{ cluster_id }}"
type: "{{ k8s_type }}"
+ - set_fact:
+ a_master: "{{ master_names[0] }}"
+ - add_host: name={{ a_master }} groups=service_master
+
- include: update.yml
+- include: ../../common/openshift-cluster/create_services.yml
+ vars:
+ create_services__master: "{{ service_master }}"
+
- include: list.yml
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
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