openstack
/
fuel-main
Code Issues Proposed changes

Correct puppet file for mcollective container 

Change-Id: I0ea53031e7bf8bd851ff7c4279e8696d110c1d95
Closes-Bug: #1349988
This commit is contained in:
Matthew Mosesohn 2014-07-31 16:33:23 +04:00
parent a617d80570
commit 9c5709de99
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/mcollective/Dockerfile
View File

@ -9,7 +9,7 @@ RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbase
ADD etc /etc
ADD start.sh /usr/local/bin/start.sh
RUN mkdir -p /var/lib/hiera && touch /etc/puppet/hiera.yaml /var/lib/hiera/common.yaml; /usr/bin/puppet apply --detailed-exitcodes -d -v /etc/puppet/modules/nailgun/examples/mcollective-only.pp; [ $? -lt 4 ]
RUN mkdir -p /var/lib/hiera && touch /etc/puppet/hiera.yaml /var/lib/hiera/common.yaml; /usr/bin/puppet apply --detailed-exitcodes -d -v /etc/puppet/modules/mcollective/examples/mcollective-server-only.pp; [ $? -lt 4 ]
#FIXME(mattymo): Workaround to make diagnostic snapshots work
RUN yum install -y nailgun Shotgun; mkdir -p /opt/nailgun/bin /var/www/nailgun/dump; ln -s /usr/bin/nailgun_dump /opt/nailgun/bin/nailgun_dump