From b5122288254db255ddc60b1e9095047abdf8c9e3 Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Sun, 10 Jan 2016 01:40:53 -0500 Subject: GCE cloud provider updates - fix overrides for gce machine type and gce machine image - Update default image for origin - Update default ssh user for origin and enterprise - Remove old commented out code - Remove wip and join_node playbooks - Added add_nodes playbook which will now allow for using bin/cluster to add additional nodes - Allow env override of ssh_user - improve list playbook --- playbooks/gce/openshift-cluster/launch.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'playbooks/gce/openshift-cluster/launch.yml') diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml index 562bf8d29..c16d8b892 100644 --- a/playbooks/gce/openshift-cluster/launch.yml +++ b/playbooks/gce/openshift-cluster/launch.yml @@ -43,6 +43,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 +52,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 -- cgit v1.2.3 From 911ba46a68ff5c9748a9e93b96e2983342a573fa Mon Sep 17 00:00:00 2001 From: Jason DeTiberus Date: Fri, 29 Jan 2016 16:31:02 -0500 Subject: add etcd hosts for gce playbooks --- playbooks/gce/openshift-cluster/launch.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'playbooks/gce/openshift-cluster/launch.yml') diff --git a/playbooks/gce/openshift-cluster/launch.yml b/playbooks/gce/openshift-cluster/launch.yml index c16d8b892..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: -- cgit v1.2.3