summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-06-03 09:11:19 -0400
committerJason DeTiberus <detiber@gmail.com>2016-06-03 09:11:19 -0400
commit31acd9c9abcc31326fe56910f1c58fd9c7673ecd (patch)
tree653e72a021e67861a7488cb8ed5c28f982a504b3
parentc298b5a489aa858882c2f9e116afeda3ffa2efd3 (diff)
parent5894cbe387834315ea212a4ab9406b37ab5ed2dc (diff)
downloadopenshift-31acd9c9abcc31326fe56910f1c58fd9c7673ecd.tar.gz
openshift-31acd9c9abcc31326fe56910f1c58fd9c7673ecd.tar.bz2
openshift-31acd9c9abcc31326fe56910f1c58fd9c7673ecd.tar.xz
openshift-31acd9c9abcc31326fe56910f1c58fd9c7673ecd.zip
Merge pull request #1979 from dumdan/issue_1970
Hardcoded values in "launch_instances" - isue # 1970
-rw-r--r--playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml4
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