diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2014-11-04 14:54:47 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2014-11-04 14:54:47 -0500 |
| commit | 1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9 (patch) | |
| tree | 658c6705b50d9ffdab19dc3c4f620153615e1bdd /roles/docker_img_puppet | |
| parent | f57018239a6e6a454fdb878b1189eaf70ae185a2 (diff) | |
| parent | 3f90353f49770cc03ebf3952778eb51ffe5063c2 (diff) | |
| download | openshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.tar.gz openshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.tar.bz2 openshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.tar.xz openshift-1d5ea59b5ceb028ec03eb2b66ae3e1aafe1b0ca9.zip | |
Merge pull request #27 from twiest/pr
making atomic proxy be able to be deployed to PROD.
Diffstat (limited to 'roles/docker_img_puppet')
| -rw-r--r-- | roles/docker_img_puppet/files/puppet_container/Dockerfile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/docker_img_puppet/files/puppet_container/Dockerfile b/roles/docker_img_puppet/files/puppet_container/Dockerfile index 0bc72d389..d5cdf1005 100644 --- a/roles/docker_img_puppet/files/puppet_container/Dockerfile +++ b/roles/docker_img_puppet/files/puppet_container/Dockerfile @@ -13,6 +13,9 @@ RUN yum -y install puppet3 crontabs cronie-anacron cronie system-config-firewall RUN rm /usr/sbin/lokkit ; ln -s /bin/true /usr/sbin/lokkit +# this is needed so that we can run puppet without running the start script +RUN mkdir -p /etc/haproxy + # END: These are to fake out puppet # Container specific files |