openstack
/
fuel-main
Code Issues Proposed changes

Fix for dhcp missed inside admin net (plus a little refactoring) 

Closes-Bug: #1320834

Change-Id: I3137377c7e4386e03d5803d60966ddf59ed05f07
This commit is contained in:
Igor Shishkin 2014-05-19 20:51:26 +04:00
parent 79d8737c47
commit 7f0cd165e7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/cobbler/start.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
mkdir -p /var/log/cobbler/{anamon,kicklog,syslog,tasks}
#reset authorized_keys file so puppet can a write new one
# reset authorized_keys file so puppet can a write new one
rm -f /etc/cobbler/authorized_keys
# Make sure services are not running (no pids, etc), puppet will
@ -9,12 +9,12 @@ rm -f /etc/cobbler/authorized_keys
/etc/init.d/httpd stop
/etc/init.d/xinetd stop
#Run puppet to apply custom config
# Run puppet to apply custom config
puppet apply -v /etc/puppet/modules/nailgun/examples/cobbler-only.pp
#stop cobbler and dnsmasq
# Stop cobbler and dnsmasq
/etc/init.d/dnsmasq stop
/etc/init.d/cobblerd stop
#Set up nailgun DB
dnsmasq -d &
# Running services
/etc/init.d/dnsmasq restart
cobblerd -F