openstack
/
fuel-main
Code Issues Proposed changes

Merge "docker: create a mount point for IBP image build directory"

This commit is contained in:
Jenkins 2015-07-21 13:02:45 +00:00 committed by Gerrit Code Review
parent 8cf0ce0111 a7aad9dc88
commit 3c5f15b0e6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/mcollective/Dockerfile
View File

@ -9,7 +9,8 @@ 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/mcollective/examples/mcollective-server-only.pp; [[ $? == 0 || $? == 2 ]]
# /var/lib/fuel/ibp is a mount point for IBP host volume
RUN mkdir -p /var/lib/hiera /var/lib/fuel/ibp && 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; [[ $? == 0 || $? == 2 ]]
#FIXME(mattymo): Workaround to make diagnostic snapshots work
RUN yum install -y shotgun fuel-agent fuel-provisioning-scripts; mkdir -p /opt/nailgun/bin /var/www/nailgun/dump; ln -s /usr/bin/nailgun_dump /opt/nailgun/bin/nailgun_dump