diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-10-17 10:43:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 10:43:16 -0400 |
| commit | 844137e9e968fb0455b9cf5128342c3e449c8abb (patch) | |
| tree | 070f227571aaeaf9d3b93d5dd13ed7842f697762 /playbooks/aws/openshift-cluster/tasks | |
| parent | 94af651106711912a7bce866517af088f4d1d0bf (diff) | |
| parent | 12b17e1af352748d00d8ba2cf3b99a623ec61641 (diff) | |
| download | openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.gz openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.bz2 openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.tar.xz openshift-844137e9e968fb0455b9cf5128342c3e449c8abb.zip | |
Merge pull request #2608 from abutcher/template-with-items
Template with_items for upstream ansible-2.2 compat.
Diffstat (limited to 'playbooks/aws/openshift-cluster/tasks')
| -rw-r--r-- | playbooks/aws/openshift-cluster/tasks/launch_instances.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml index d22c86cda..4d76d3bfe 100644 --- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml @@ -99,8 +99,8 @@ - name: Add Name tag to instances ec2_tag: resource={{ item.1.id }} region={{ deployment_vars[deployment_type].region }} state=present with_together: - - instances - - ec2.instances + - "{{ instances }}" + - "{{ ec2.instances }}" args: tags: Name: "{{ item.0 }}" @@ -154,8 +154,8 @@ openshift_node_labels: "{{ node_label }}" logrotate_scripts: "{{ logrotate }}" with_together: - - instances - - ec2.instances + - "{{ instances }}" + - "{{ ec2.instances }}" - name: Add new instances to nodes_to_add group if needed add_host: @@ -169,13 +169,13 @@ openshift_node_labels: "{{ node_label }}" logrotate_scripts: "{{ logrotate }}" with_together: - - instances - - ec2.instances + - "{{ instances }}" + - "{{ ec2.instances }}" when: oo_extend_env is defined and oo_extend_env | bool - name: Wait for ssh wait_for: "port=22 host={{ item.dns_name }}" - with_items: ec2.instances + with_items: "{{ ec2.instances }}" - name: Wait for user setup command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null {{ hostvars[item.0].ansible_ssh_user }}@{{ item.1.dns_name }} echo {{ hostvars[item.0].ansible_ssh_user }} user is setup" @@ -184,5 +184,5 @@ retries: 20 delay: 10 with_together: - - instances - - ec2.instances + - "{{ instances }}" + - "{{ ec2.instances }}" |