openstack
/
fuel-main
Code Issues Proposed changes

Dnsmasq config clean up 

Remove no longer needed conditions in docker start scripts.

Partial blueprint: dynamic-dnsmasq

Change-Id: I7f88d6fa99927b2b3e761a5733ecf0284166a5b9
This commit is contained in:
Aleksandr Didenko 2015-11-16 12:58:43 +01:00
parent 266f9b3749
commit 1ce996adc8
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/cobbler/start.sh
View File

@ -33,14 +33,8 @@ puppet apply -v /etc/puppet/modules/nailgun/examples/cobbler-only.pp
# Check if we have any dhcp-ranges configured in dnsmasq. If not, then
# we need to create default dhcp-range for fuelweb_admin network that
# was configured via fuelmenu and stored in /etc/fuel/astute.yaml
# TODO: remove 'test -f' when I9d7428c9fc21c705a1aee7fbca8003829a81e1d0
# is merged
ls /etc/dnsmasq.d/*.conf || \
( \
test -f /etc/puppet/modules/nailgun/examples/dhcp-default-range.pp && \
puppet apply -d -v /etc/puppet/modules/nailgun/examples/dhcp-default-range.pp \
)
puppet apply -d -v /etc/puppet/modules/nailgun/examples/dhcp-default-range.pp
# Running services
/etc/init.d/dnsmasq restart

5
docker/mcollective/start.sh
View File

@ -5,10 +5,7 @@
rm -f /var/lib/rpm/__db.*
rpm --rebuilddb
# TODO: remove 'test -f' when I9d7428c9fc21c705a1aee7fbca8003829a81e1d0
# is merged
test -f /etc/puppet/modules/nailgun/examples/hiera-for-container.pp && \
puppet apply -d -v /etc/puppet/modules/nailgun/examples/hiera-for-container.pp
puppet apply -d -v /etc/puppet/modules/nailgun/examples/hiera-for-container.pp
# TODO(bpiotrowski): remove old file path after new ISO is used on CI
if [[ -f /etc/puppet/modules/mcollective/examples/mcollective-server-only.pp ]]; then