openstack/tripleo-common
Code Issues Proposed changes

heat-agents use moved 40-hiera-datafiles

Browse Source 
Since I6a383b1ad4ec29458569763bd3f56fd3f2bd726b 40-hiera-datafiles
has moved. This change builds the heat-agents image with the new path.

Also 10-hiera-disable is also included to handle the transition to
using the dedicated hiera hook.

Change-Id: I2710a92f7c77e9ed0b32d5aeece3bf4bc5d428bf
This commit is contained in:
Steve Baker
2016-12-05 00:49:11 +00:00
parent bb7e8dbe3a
commit d0033ddaf6
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
heat_docker_agent/configure_container.sh
View File

@@ -82,7 +82,9 @@ ln -sf /usr/share/tripleo-puppet-elements/hiera/os-apply-config/etc/puppet/hiera
ln -sf /etc/puppet/hiera.yaml /etc/hiera.yaml
# Configure os-*
ln -sf /usr/share/tripleo-puppet-elements/hiera/os-refresh-config/configure.d/40-hiera-datafiles \
ln -sf /usr/share/tripleo-puppet-elements/hiera/40-hiera-datafiles \
/usr/libexec/os-refresh-config/configure.d/
ln -sf /usr/share/tripleo-puppet-elements/hiera/10-hiera-disable \
/usr/libexec/os-refresh-config/configure.d/
mkdir -p /usr/libexec/os-refresh-config/post-configure.d
ln -sf /usr/share/tripleo-image-elements/os-refresh-config/os-refresh-config/post-configure.d/99-refresh-completed \