summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-06 14:52:37 +0200
committerMartin André <m.andre@redhat.com>2017-06-08 15:54:07 +0000
commit67599bbc803b771cf0072f5f204b71849f153ddf (patch)
treed6d2b1774a023f8ce812baf3a5bf8fc609c8f133
parent894631cae672c91df212b27cc0ddc2378a2cc770 (diff)
Remove symlinks causing hiera hook to exit early
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 (cherry picked from commit 14d69e46892fbe903197aefb54ec18773d82d27c)
Notes
Notes (review): Code-Review+2: Marios Andreou <marios@redhat.com> Code-Review+2: Jiri Stransky <jistr@redhat.com> Workflow+1: Jiri Stransky <jistr@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 09 Jun 2017 18:57:19 +0000 Reviewed-on: https://review.openstack.org/471337 Project: openstack/tripleo-common Branch: refs/heads/stable/ocata
-rwxr-xr-xheat_docker_agent/configure_container.sh13
1 files changed, 1 insertions, 12 deletions
diff --git a/heat_docker_agent/configure_container.sh b/heat_docker_agent/configure_container.sh
index bbcc695..8c5253b 100755
--- a/heat_docker_agent/configure_container.sh
+++ b/heat_docker_agent/configure_container.sh
@@ -54,11 +54,7 @@ yum install -y \
54 os-net-config \ 54 os-net-config \
55 dhclient \ 55 dhclient \
56 ethtool \ 56 ethtool \
57 python-heat-agent-apply-config \ 57 python-heat-agent-* \
58 python-heat-agent-docker-cmd \
59 python-heat-agent-hiera \
60 python-heat-agent-puppet \
61 python-heat-agent-json-file \
62 python-ipaddr \ 58 python-ipaddr \
63 python-memcached \ 59 python-memcached \
64 python2-oslo-log \ 60 python2-oslo-log \
@@ -95,16 +91,9 @@ mkdir -p /etc/puppet/modules
95ln -sf /usr/share/openstack-puppet/modules/* /etc/puppet/modules/ 91ln -sf /usr/share/openstack-puppet/modules/* /etc/puppet/modules/
96 92
97# And puppet hiera 93# And puppet hiera
98mkdir -p /usr/libexec/os-apply-config/templates/etc/puppet
99ln -sf /usr/share/tripleo-puppet-elements/hiera/os-apply-config/etc/puppet/hiera.yaml \
100 /usr/libexec/os-apply-config/templates/etc/puppet/
101ln -sf /etc/puppet/hiera.yaml /etc/hiera.yaml 94ln -sf /etc/puppet/hiera.yaml /etc/hiera.yaml
102 95
103# Configure os-* 96# Configure os-*
104ln -sf /usr/share/tripleo-puppet-elements/hiera/40-hiera-datafiles \
105 /usr/libexec/os-refresh-config/configure.d/
106ln -sf /usr/share/tripleo-puppet-elements/hiera/10-hiera-disable \
107 /usr/libexec/os-refresh-config/configure.d/
108mkdir -p /usr/libexec/os-refresh-config/post-configure.d 97mkdir -p /usr/libexec/os-refresh-config/post-configure.d
109ln -sf /usr/share/tripleo-image-elements/os-refresh-config/os-refresh-config/post-configure.d/99-refresh-completed \ 98ln -sf /usr/share/tripleo-image-elements/os-refresh-config/os-refresh-config/post-configure.d/99-refresh-completed \
110 /usr/libexec/os-refresh-config/post-configure.d/ 99 /usr/libexec/os-refresh-config/post-configure.d/