openstack
/
fuel-main
Code Issues Proposed changes

Swap manifest location check order in mcollective container 

Currently Dockerfile checks if "old" manifest exists, and if not,
proceeds to the to-be-introduced one. This behavior makes it
impossible to make CI pass for I1657ce22be62414abd4a407a5d28292f25915a7b.

The modified conditional will fallback to the old manifest only if new
one doesn't exist.

Related-bug: 1508058
Change-Id: Iab069b6c660edf0c7932a61cc480530447932708
This commit is contained in:
Bartłomiej Piotrowski 2015-11-10 11:53:02 +01:00
parent 3b64b95f6b
commit b5eb33ca71
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/mcollective/Dockerfile
View File

@ -20,12 +20,12 @@ ADD start.sh /usr/local/bin/start.sh
# TODO(bpiotrowski): remove old file path after new ISO is used on CI
RUN mkdir -p /var/lib/fuel/ibp; \
if [[ -f /etc/puppet/modules/mcollective/examples/mcollective-server-only.pp ]]; then \
/usr/bin/puppet apply --detailed-exitcodes -d -v \
/etc/puppet/modules/mcollective/examples/mcollective-server-only.pp; \
else \
if [[ -f /etc/puppet/modules/nailgun/examples/mcollective-only.pp ]]; then \
/usr/bin/puppet apply --detailed-exitcodes -d -v \
/etc/puppet/modules/nailgun/examples/mcollective-only.pp; \
else \
/usr/bin/puppet apply --detailed-exitcodes -d -v \
/etc/puppet/modules/mcollective/examples/mcollective-server-only.pp; \
fi; \
[[ $? == 0 || $? == 2 ]]