diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-01-10 01:40:53 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-02-02 14:42:49 -0500 |
| commit | b5122288254db255ddc60b1e9095047abdf8c9e3 (patch) | |
| tree | be2cb940731a103a334518057a1619322f5ca7be /playbooks/gce/openshift-cluster/launch.yml | |
| parent | 8ed73ca866da18963a7868eb1d0f66ba63a0d425 (diff) | |
| download | openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.tar.gz openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.tar.bz2 openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.tar.xz openshift-b5122288254db255ddc60b1e9095047abdf8c9e3.zip | |
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
Diffstat (limited to 'playbooks/gce/openshift-cluster/launch.yml')
| -rw-r--r-- | playbooks/gce/openshift-cluster/launch.yml | 14 |
1 files changed, 2 insertions, 12 deletions
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 |