diff options
Diffstat (limited to 'playbooks/gce')
| -rw-r--r-- | playbooks/gce/openshift-cluster/list.yml | 2 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/tasks/launch_instances.yml | 6 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/terminate.yml | 4 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/update.yml | 4 | 
4 files changed, 8 insertions, 8 deletions
| diff --git a/playbooks/gce/openshift-cluster/list.yml b/playbooks/gce/openshift-cluster/list.yml index c29cac272..34dcd2496 100644 --- a/playbooks/gce/openshift-cluster/list.yml +++ b/playbooks/gce/openshift-cluster/list.yml @@ -16,7 +16,7 @@        groups: oo_list_hosts        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"        ansible_become: "{{ deployment_vars[deployment_type].become }}" -    with_items: groups[scratch_group] | default([], true) | difference(['localhost']) | difference(groups.status_terminated | default([], true)) +    with_items: "{{ groups[scratch_group] | default([], true) | difference(['localhost']) | difference(groups.status_terminated | default([], true)) }}"  - name: List Hosts    hosts: oo_list_hosts diff --git a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml index 60cf21a5b..7c8189224 100644 --- a/playbooks/gce/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/gce/openshift-cluster/tasks/launch_instances.yml @@ -49,11 +49,11 @@      gce_public_ip: "{{ item.public_ip }}"      gce_private_ip: "{{ item.private_ip }}"      openshift_node_labels: "{{ node_label }}" -  with_items: gce.instance_data | default([], true) +  with_items: "{{ gce.instance_data | default([], true) }}"  - name: Wait for ssh    wait_for: port=22 host={{ item.public_ip }} -  with_items: gce.instance_data | default([], true) +  with_items: "{{ gce.instance_data | default([], true) }}"  - name: Wait for user setup    command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ hostvars[item.name].ansible_ssh_user }}@{{ item.public_ip }} echo {{ hostvars[item.name].ansible_ssh_user }} user is setup" @@ -61,4 +61,4 @@    until: result.rc == 0    retries: 30    delay: 5 -  with_items: gce.instance_data | default([], true) +  with_items: "{{ gce.instance_data | default([], true) }}" diff --git a/playbooks/gce/openshift-cluster/terminate.yml b/playbooks/gce/openshift-cluster/terminate.yml index 6a0ac088a..68e60f9d4 100644 --- a/playbooks/gce/openshift-cluster/terminate.yml +++ b/playbooks/gce/openshift-cluster/terminate.yml @@ -12,7 +12,7 @@        groups: oo_hosts_to_terminate        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"        ansible_become: "{{ deployment_vars[deployment_type].become }}" -    with_items: (groups['tag_clusterid-' ~ cluster_id] | default([])) | difference(['localhost']) +    with_items: "{{ (groups['tag_clusterid-' ~ cluster_id] | default([])) | difference(['localhost']) }}"  - name: Unsubscribe VMs    hosts: oo_hosts_to_terminate @@ -43,7 +43,7 @@          pem_file: "{{ lookup('env', 'gce_service_account_pem_file_path') }}"          project_id: "{{ lookup('env', 'gce_project_id') }}"          zone: "{{ lookup('env', 'zone') }}" -      with_items: groups['oo_hosts_to_terminate'] | default([], true) +      with_items: "{{ groups['oo_hosts_to_terminate'] | default([], true) }}"        when: item is defined  #- include: ../openshift-node/terminate.yml diff --git a/playbooks/gce/openshift-cluster/update.yml b/playbooks/gce/openshift-cluster/update.yml index 332f27da7..6d2af3d26 100644 --- a/playbooks/gce/openshift-cluster/update.yml +++ b/playbooks/gce/openshift-cluster/update.yml @@ -7,7 +7,7 @@    - add_host:        name: "{{ item }}"        groups: l_oo_all_hosts -    with_items: g_all_hosts +    with_items: "{{ g_all_hosts }}"  - hosts: l_oo_all_hosts    gather_facts: no @@ -27,7 +27,7 @@        groups: oo_hosts_to_update        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"        ansible_become: "{{ deployment_vars[deployment_type].become }}" -    with_items: g_all_hosts | default([]) +    with_items: "{{ g_all_hosts | default([]) }}"  - include: ../../common/openshift-cluster/update_repos_and_packages.yml | 
