diff options
Diffstat (limited to 'playbooks/aws/openshift-cluster/upgrades')
| -rw-r--r-- | playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml | 28 | 
1 files changed, 6 insertions, 22 deletions
diff --git a/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml index 20cc97c8a..231356798 100644 --- a/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +++ b/playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml @@ -2,32 +2,16 @@  # This playbook upgrades an existing AWS cluster, leaving nodes untouched if used with an 'online' deployment type.  # Usage:  #  ansible-playbook playbooks/aws/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml -e deployment_type=online -e cluster_id=<cluster_id> -- hosts: localhost -  gather_facts: no -  vars_files: -  - ../../vars.yml -  - "../../vars.{{ deployment_type }}.{{ cluster_id }}.yml" - -  tasks: -  - set_fact: -      g_ssh_user_tmp: "{{ deployment_vars[deployment_type].ssh_user }}" -      g_sudo_tmp: "{{ deployment_vars[deployment_type].sudo }}" - -  - set_fact: -      tmp_nodes_group: "{{ 'tag_env-host-type_' ~ cluster_id ~ '-openshift-node' }}" -    when: deployment_type != 'online' -  - include: ../../../../common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml +  vars_files: +  - ../../../../aws/openshift-cluster/vars.yml +  - ../../../../aws/openshift-cluster/cluster_hosts.yml    vars: -    g_etcd_hosts:   "{{ (groups['tag_host-type_etcd']|default([]))   | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" -    g_lb_hosts:     "{{ (groups['tag_host-type_lb']|default([]))     | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" -    g_master_hosts: "{{ (groups['tag_host-type_master']|default([])) | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" -    g_node_hosts:   "{{ (groups['tag_host-type_node']|default([]))   | intersect((groups['tag_env_' ~ cluster_id]|default([]))) }}" -    g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}" -    g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}" +    g_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" +    g_sudo: "{{ deployment_vars[deployment_type].sudo }}"      g_nodeonmaster: true      openshift_cluster_id: "{{ cluster_id }}" -    openshift_debug_level: 2 +    openshift_debug_level: "{{ debug_level }}"      openshift_deployment_type: "{{ deployment_type }}"      openshift_hostname: "{{ ec2_private_ip_address }}"      openshift_public_hostname: "{{ ec2_ip_address }}"  | 
