summaryrefslogtreecommitdiffstats
path: root/playbooks/libvirt
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-20 10:22:27 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-20 10:22:27 -0400
commit205927e40513f9162523e1039d3f25d63ace5a1e (patch)
tree93595058abbf600edebee8fbe772b2da3af530e2 /playbooks/libvirt
parent25354bb8f15efb829174ad53d56a31ff2fc95be9 (diff)
parent2679d760c8abbb1140f82582329dfdc8be835a76 (diff)
downloadopenshift-205927e40513f9162523e1039d3f25d63ace5a1e.tar.gz
openshift-205927e40513f9162523e1039d3f25d63ace5a1e.tar.bz2
openshift-205927e40513f9162523e1039d3f25d63ace5a1e.tar.xz
openshift-205927e40513f9162523e1039d3f25d63ace5a1e.zip
Merge pull request #711 from jaryn/fix_libvirt_ip_issues
Fix libvirt ip issues
Diffstat (limited to 'playbooks/libvirt')
-rw-r--r--playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml2
-rw-r--r--playbooks/libvirt/openshift-cluster/templates/user-data2
2 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 2a0c90b46..4b91c6da8 100644
--- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
@@ -64,7 +64,7 @@
register: nb_allocated_ips
until: nb_allocated_ips.stdout == '{{ instances | length }}'
retries: 60
- delay: 1
+ delay: 3
when: instances | length != 0
- name: Collect IP addresses of the VMs
diff --git a/playbooks/libvirt/openshift-cluster/templates/user-data b/playbooks/libvirt/openshift-cluster/templates/user-data
index 77b788109..eacae7c7e 100644
--- a/playbooks/libvirt/openshift-cluster/templates/user-data
+++ b/playbooks/libvirt/openshift-cluster/templates/user-data
@@ -19,5 +19,5 @@ system_info:
ssh_authorized_keys:
- {{ lookup('file', '~/.ssh/id_rsa.pub') }}
-bootcmd:
+runcmd:
- NETWORK_CONFIG=/etc/sysconfig/network-scripts/ifcfg-eth0; if ! grep DHCP_HOSTNAME ${NETWORK_CONFIG}; then echo 'DHCP_HOSTNAME="{{ item[0] }}.example.com"' >> ${NETWORK_CONFIG}; fi; pkill -9 dhclient; service network restart