summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/launch.yml
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-10-05 13:49:08 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-10-05 13:49:08 -0400
commit9fd4af295a7c88b4c112b9bd500e396a766b3dc0 (patch)
treec86ab69cda7d6a1402c779968bb20b41c8fd4012 /playbooks/gce/openshift-cluster/launch.yml
parent7918909dc7c6877a4ce2b9fab830d0c41c1c92fd (diff)
parent3073d1f729f9dcd202088f6b318b465567c6344b (diff)
downloadopenshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.gz
openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.bz2
openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.tar.xz
openshift-9fd4af295a7c88b4c112b9bd500e396a766b3dc0.zip
Merge pull request #654 from openshift/revert-641-gce-support
Revert "GCE support" because it breaks openstack.
Diffstat (limited to 'playbooks/gce/openshift-cluster/launch.yml')
-rw-r--r--playbooks/gce/openshift-cluster/launch.yml54
1 files changed, 27 insertions, 27 deletions
diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
index 94e57fe4e..7a3b80da0 100644
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ b/playbooks/gce/openshift-cluster/launch.yml
@@ -28,33 +28,33 @@
type: "{{ k8s_type }}"
g_sub_host_type: "{{ sub_host_type }}"
-# - include: ../../common/openshift-cluster/set_infra_launch_facts_tasks.yml
-# vars:
-# type: "infra"
-# count: "{{ num_infra }}"
-# - include: tasks/launch_instances.yml
-# vars:
-# instances: "{{ infra_names }}"
-# cluster: "{{ cluster_id }}"
-# type: "{{ k8s_type }}"
-# g_sub_host_type: "{{ sub_host_type }}"
-#
-# - set_fact:
-# a_infra: "{{ infra_names[0] }}"
-# - add_host: name={{ a_infra }} groups=service_master
-#
+ - include: ../../common/openshift-cluster/set_node_launch_facts_tasks.yml
+ vars:
+ type: "infra"
+ count: "{{ num_infra }}"
+ - include: tasks/launch_instances.yml
+ vars:
+ instances: "{{ infra_names }}"
+ cluster: "{{ cluster_id }}"
+ type: "{{ k8s_type }}"
+ g_sub_host_type: "{{ sub_host_type }}"
+
+ - set_fact:
+ a_infra: "{{ infra_names[0] }}"
+ - add_host: name={{ a_infra }} groups=service_master
+
- include: update.yml
-#
-#- name: Deploy OpenShift Services
-# hosts: service_master
-# connection: ssh
-# gather_facts: yes
-# roles:
-# - openshift_registry
-# - openshift_router
-#
-#- include: ../../common/openshift-cluster/create_services.yml
-# vars:
-# g_svc_master: "{{ service_master }}"
+
+- name: Deploy OpenShift Services
+ hosts: service_master
+ connection: ssh
+ gather_facts: yes
+ roles:
+ - openshift_registry
+ - openshift_router
+
+- include: ../../common/openshift-cluster/create_services.yml
+ vars:
+ g_svc_master: "{{ service_master }}"
- include: list.yml