summaryrefslogtreecommitdiffstats
path: root/playbooks/gce/openshift-cluster/launch.yml
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2016-02-02 15:20:51 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2016-02-02 15:20:51 -0500
commitff8f2013a8dde61bc8fe57c545c716b9a3dc4098 (patch)
tree6e14488702f5538d238fe89451e7fdb4ca7087b7 /playbooks/gce/openshift-cluster/launch.yml
parent8ed73ca866da18963a7868eb1d0f66ba63a0d425 (diff)
parent2f3458447c23e8020af3dc08444fdb33201118e3 (diff)
downloadopenshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.tar.gz
openshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.tar.bz2
openshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.tar.xz
openshift-ff8f2013a8dde61bc8fe57c545c716b9a3dc4098.zip
Merge pull request #1238 from detiber/gce_fixes
GCE cloud provider updates
Diffstat (limited to 'playbooks/gce/openshift-cluster/launch.yml')
-rw-r--r--playbooks/gce/openshift-cluster/launch.yml25
1 files changed, 13 insertions, 12 deletions
diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml
index 562bf8d29..7532a678b 100644
--- a/playbooks/gce/openshift-cluster/launch.yml
+++ b/playbooks/gce/openshift-cluster/launch.yml
@@ -10,6 +10,17 @@
- fail: msg="Deployment type not supported for gce provider yet"
when: deployment_type == 'enterprise'
+ - include: ../../common/openshift-cluster/tasks/set_etcd_launch_facts.yml
+ - include: tasks/launch_instances.yml
+ vars:
+ instances: "{{ etcd_names }}"
+ cluster: "{{ cluster_id }}"
+ type: "{{ k8s_type }}"
+ g_sub_host_type: "default"
+ gce_machine_type: "{{ lookup('env', 'gce_machine_etcd_type') | default(lookup('env', 'gce_machine_type'), true) }}"
+ gce_machine_image: "{{ lookup('env', 'gce_machine_etcd_image') | default(lookup('env', 'gce_machine_image'), true) }}"
+
+
- include: ../../common/openshift-cluster/tasks/set_master_launch_facts.yml
- include: tasks/launch_instances.yml
vars:
@@ -43,6 +54,8 @@
cluster: "{{ cluster_id }}"
type: "{{ k8s_type }}"
g_sub_host_type: "{{ sub_host_type }}"
+ gce_machine_type: "{{ lookup('env', 'gce_machine_node_type') | default(lookup('env', 'gce_machine_type'), true) }}"
+ gce_machine_image: "{{ lookup('env', 'gce_machine_node_image') | default(lookup('env', 'gce_machine_image'), true) }}"
- add_host:
name: "{{ master_names.0 }}"
@@ -50,17 +63,5 @@
when: master_names is defined and master_names.0 is defined
- 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 }}"
- include: list.yml