diff options
author | Diego Castro <spinolacastro@gmail.com> | 2015-10-22 16:22:43 -0300 |
---|---|---|
committer | Diego Castro <spinolacastro@gmail.com> | 2015-10-22 16:22:43 -0300 |
commit | f559eb3146c65a6ec58f0fed3eb2d1124c1314c7 (patch) | |
tree | 24975a7a87568784b88252bc70d14f7b302670b0 /playbooks/libvirt/openshift-cluster/templates/user-data | |
parent | 8468d25fae71c80277c10ad975641cb1ba230fd8 (diff) | |
parent | e6d426fddd79c08452195cd32286bb600f62d51d (diff) | |
download | openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.gz openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.bz2 openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.xz openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.zip |
fix merge conflicts
Diffstat (limited to 'playbooks/libvirt/openshift-cluster/templates/user-data')
-rw-r--r-- | playbooks/libvirt/openshift-cluster/templates/user-data | 2 |
1 files changed, 1 insertions, 1 deletions
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 |