commit 4c2c3de1c6d459e611cb3bd1dddacde1f2122b94
Author: Alex Schultz <email address hidden>
Date: Thu Jan 4 16:23:37 2018 -0700
Use docker_config_scripts for puppet apply
There are some configuration applies that we need to do during the
deployment. These currently live as manually constructed bash runs which
are missing the --detailed-exitcode handling to know when we have
failures. In order to reduce the duplicated code and simplify this
exeuction, this change creates a docker_config_scripts with
docker_puppet_run.sh in containers-common that can be reused by any of
the docker services. This allows use to properly handle
--detailed-exitcodes while also reducing the amount of duplicated code
bits that we have within THT.
Additionally this change adds a new shared value for ContainersCommon to
pull the required volumes for the docker_puppet_apply.sh script into a
single place. Unfortunately the existing volumes from ContainersCommon
includes a mount for /etc/puppet to /etc/puppet which causes problems
because we need to be able to write out a hiera value. The /etc/puppet
mount is needed for the bootstrap_host_exec function which is consumed
by various docker_config tasks but the mount conflicts with the puppet
apply logic being used.
Reviewed: https:/ /review. openstack. org/533062 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=4c2c3de1c6d 459e611cb3bd1dd dacde1f2122b94
Committed: https:/
Submitter: Zuul
Branch: stable/pike
commit 4c2c3de1c6d459e 611cb3bd1dddacd e1f2122b94
Author: Alex Schultz <email address hidden>
Date: Thu Jan 4 16:23:37 2018 -0700
Use docker_ config_ scripts for puppet apply
There are some configuration applies that we need to do during the config_ scripts with puppet_ run.sh in containers-common that can be reused by any of exitcodes while also reducing the amount of duplicated code
deployment. These currently live as manually constructed bash runs which
are missing the --detailed-exitcode handling to know when we have
failures. In order to reduce the duplicated code and simplify this
exeuction, this change creates a docker_
docker_
the docker services. This allows use to properly handle
--detailed-
bits that we have within THT.
Additionally this change adds a new shared value for ContainersCommon to puppet_ apply.sh script into a
pull the required volumes for the docker_
single place. Unfortunately the existing volumes from ContainersCommon
includes a mount for /etc/puppet to /etc/puppet which causes problems
because we need to be able to write out a hiera value. The /etc/puppet
mount is needed for the bootstrap_host_exec function which is consumed
by various docker_config tasks but the mount conflicts with the puppet
apply logic being used.
Depends-On: I940cec6d670df3 9ac6e2a3559a028 acbeee99331 39bbb34c3a088c5 5e1f14fddca 890c4438d1315eb aa776c1d09)
Change-Id: Icf4a64ed76635e
Related-Bug: #1741345
Co-Authored-By: Damien Ciabrini <email address hidden>
(cherry picked from commit 6f834f60e619181