Merge "Fix bug in docker-toool where values are sometimes empty."

[apex-tripleo-heat-templates.git] / docker / services / containers-common.yaml

diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml
index d3561f6..973d999 100644 (file)
--- a/docker/services/containers-common.yaml
+++ b/docker/services/containers-common.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Contains a static list of common things necessary for containers
@@ -9,8 +9,13 @@ outputs:
     value:
       - /etc/hosts:/etc/hosts:ro
       - /etc/localtime:/etc/localtime:ro
+      # required for bootstrap_host_exec
+      - /etc/puppet:/etc/puppet:ro
       # OpenSSL trusted CAs
       - /etc/pki/ca-trust/extracted:/etc/pki/ca-trust/extracted:ro
       - /etc/pki/tls/certs/ca-bundle.crt:/etc/pki/tls/certs/ca-bundle.crt:ro
       - /etc/pki/tls/certs/ca-bundle.trust.crt:/etc/pki/tls/certs/ca-bundle.trust.crt:ro
       - /etc/pki/tls/cert.pem:/etc/pki/tls/cert.pem:ro
+      # Syslog socket
+      - /dev/log:/dev/log
+      - /etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro