diff options
author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
---|---|---|
committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-06 08:48:05 -0300 |
commit | 81cb935e1817df4c633397680e963d635ed42e26 (patch) | |
tree | dd595fab3ae4cc8f5d47dcc2297ff34def6f571c /playbooks/libvirt/openshift-cluster | |
parent | 0514bdffca4e06144f4f81db037490d2c0fede40 (diff) | |
parent | 6fb6e059dc50fcdc2480c06cfcf0a45674283725 (diff) | |
download | openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.gz openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.bz2 openshift-81cb935e1817df4c633397680e963d635ed42e26.tar.xz openshift-81cb935e1817df4c633397680e963d635ed42e26.zip |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'playbooks/libvirt/openshift-cluster')
-rw-r--r-- | playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml index 7231f255a..833586ffa 100644 --- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml +++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml @@ -83,7 +83,7 @@ with_items: instances - name: Wait for the VMs to get an IP - shell: 'virsh -c {{ libvirt_uri }} net-dhcp-leases openshift-ansible | egrep -c ''{{ instances | join("|") }}''' + shell: 'virsh -c {{ libvirt_uri }} net-dhcp-leases {{ libvirt_network }} | egrep -c ''{{ instances | join("|") }}''' register: nb_allocated_ips until: nb_allocated_ips.stdout == '{{ instances | length }}' retries: 60 @@ -91,7 +91,7 @@ when: instances | length != 0 - name: Collect IP addresses of the VMs - shell: 'virsh -c {{ libvirt_uri }} net-dhcp-leases openshift-ansible | awk ''$6 == "{{ item }}" {gsub(/\/.*/, "", $5); print $5}''' + shell: 'virsh -c {{ libvirt_uri }} net-dhcp-leases {{ libvirt_network }} | awk ''$6 == "{{ item }}" {gsub(/\/.*/, "", $5); print $5}''' register: scratch_ip with_items: instances |