diff --git a/roles/libvirt/setup/overcloud/tasks/libvirt_nodepool.yml b/roles/libvirt/setup/overcloud/tasks/libvirt_nodepool.yml
index 27ea9417c..dfcfbfa95 100644
--- a/roles/libvirt/setup/overcloud/tasks/libvirt_nodepool.yml
+++ b/roles/libvirt/setup/overcloud/tasks/libvirt_nodepool.yml
@@ -177,8 +177,8 @@
   script: "get-domain-ip.sh subnode-0"
   register: "subnode_0_ip_result"
   until: "subnode_0_ip_result is success"
-  retries: 20
-  delay: 20
+  retries: "{{ libvirt_wait_retries }}"
+  delay: "{{ libvirt_wait_delay }}"
 
 - name: Set_fact for undercloud ip
   set_fact:
@@ -226,8 +226,8 @@
   script: "get-domain-ip.sh subnode-1"
   register: "subnode_1_ip_result"
   until: "subnode_1_ip_result is success"
-  retries: 20
-  delay: 20
+  retries: "{{ libvirt_wait_retries }}"
+  delay: "{{ libvirt_wait_delay }}"
 
 - name: Set_fact for undercloud ip
   set_fact:
diff --git a/roles/libvirt/setup/overcloud/tasks/vars/libvirt_nodepool_vars.yml b/roles/libvirt/setup/overcloud/tasks/vars/libvirt_nodepool_vars.yml
index f887c277e..c9ebc857a 100644
--- a/roles/libvirt/setup/overcloud/tasks/vars/libvirt_nodepool_vars.yml
+++ b/roles/libvirt/setup/overcloud/tasks/vars/libvirt_nodepool_vars.yml
@@ -21,3 +21,5 @@ images:
     url: https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1802.qcow2
     type: qcow2
     md5sum: "b3ff9077d80b5f17bcbb7356f7982fd4 *CentOS-7-x86_64-GenericCloud-1802.qcow2"
+libvirt_wait_retries: 30
+libvirt_wait_delay: 20