sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix heat-cfntools to work on Fedora"

Browse Source
This commit is contained in:
Jenkins 2013-02-28 05:19:47 +00:00 committed by Gerrit Code Review
commit 07c476b590
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/fedora/install.d/00-lsb Executable file
View File

@ -0,0 +1,3 @@
#!/bin/bash
exec install-packages redhat-lsb

9
elements/heat-cfntools/install.d/10-ec2-user
View File

@ -4,6 +4,12 @@
set -uex set -uex
# This is a specific workaround for Ubuntu
distro=$(lsb_release -is || :)
if [ "$distro" != "Ubuntu" ] ; then
exit 0
fi
# Setup ec2-user as expected by HEAT # Setup ec2-user as expected by HEAT
if ! getent passwd ec2-user ; then if ! getent passwd ec2-user ; then
useradd -m -G admin ec2-user -s /bin/bash useradd -m -G admin ec2-user -s /bin/bash
@ -23,4 +29,5 @@ Pin: release o=LP-PPA-tripleo-demo
Pin-Priority: 900 Pin-Priority: 900
EOF EOF
# Should pull from demo PPA if cloud-init exists there. # Should pull from demo PPA if cloud-init exists there.
install-packages cloud-init # Since this is Ubuntu only, the --force-yes is OK
install-packages --force-yes cloud-init