openstack/tripleo-common
Code Issues Proposed changes

Remove symlinks causing hiera hook to exit early

Browse Source 
These symlinks were causing the deployment to fail early because the
hiera hook detected legacy install [1]. This commit stop symlinking the
files and installs the python-heat-agent hooks as in the newton to
ocata upgrade script [2].

[1] https://github.com/openstack/heat-agents/blob/stable/ocata/heat-config-hiera/install.d/hook-hiera.py#L40-L59
[2] https://review.openstack.org/#/c/424715/2/extraconfig/tasks/newton_ocata_upgrade_init_common.sh

Change-Id: I1c72a82cfba9947fe2201e8f85111c30bb8d486a
Closes-Bug: #1696118
This commit is contained in:
Martin André 2017-06-06 14:52:37 +02:00
parent b309ac1e30
commit 14d69e4689
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
heat_docker_agent/configure_container.sh
View File

@ -54,11 +54,7 @@ yum install -y \
os-net-config \
dhclient \
ethtool \
python-heat-agent-apply-config \
python-heat-agent-docker-cmd \
python-heat-agent-hiera \
python-heat-agent-puppet \
python-heat-agent-json-file \
python-heat-agent-* \
python-ipaddr \
python-memcached \
python2-oslo-log \
@ -95,16 +91,9 @@ mkdir -p /etc/puppet/modules
ln -sf /usr/share/openstack-puppet/modules/* /etc/puppet/modules/
# And puppet hiera
mkdir -p /usr/libexec/os-apply-config/templates/etc/puppet
ln -sf /usr/share/tripleo-puppet-elements/hiera/os-apply-config/etc/puppet/hiera.yaml \
/usr/libexec/os-apply-config/templates/etc/puppet/
ln -sf /etc/puppet/hiera.yaml /etc/hiera.yaml
# Configure os-*
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 \
/usr/libexec/os-refresh-config/post-configure.d/