From edb7a6dbe9b2845dea0c1699ed382d623e45e0db Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Thu, 5 Dec 2013 10:41:25 +1300 Subject: [PATCH] Call cfn-create-aws-symlinks in boothook.sh Images which have heat-cfntools installed from rpm or deb will not have cfn tool links in /opt/aws/bin. This change runs cfn-create-aws-symlinks during cloud-init boothook.sh. It should do the following: * if no cfn tools exist in /opt/aws/bin, symlinks from /usr/bin will be created * if cfn tools exist in /opt/aws/bin, no symlinks are created * if cfn-create-aws-symlinks doesn't exist, there will be no effect This is required to use a vanilla Fedora 20 cloud image with heat, which has heat-cfntools pre-installed. Change-Id: I5426fdad3031f91b4b9c1f9c9c19ac9cc42cf2dd --- heat/cloudinit/boothook.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/heat/cloudinit/boothook.sh b/heat/cloudinit/boothook.sh index f7d46a7f53..38db6737b6 100755 --- a/heat/cloudinit/boothook.sh +++ b/heat/cloudinit/boothook.sh @@ -3,5 +3,9 @@ setenforce 0 useradd -m @INSTANCE_USER@ echo -e '@INSTANCE_USER@\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers +# in case heat-cfntools has been installed from package but no symlinks +# are yet in /opt/aws/bin/ +cfn-create-aws-symlinks + # Do not remove - the cloud boothook should always return success exit 0