Fix heat-cfntools to work on Fedora
Also add redhat-lsb to Fedora images for lsb_release which should prove useful as a way to do distro-specific things. Change-Id: Ie32566349319ca244fa02065bb9f81c36c1b49fb
This commit is contained in:
parent
b2314243c6
commit
614b6af62f
3
elements/fedora/install.d/00-lsb
Executable file
3
elements/fedora/install.d/00-lsb
Executable file
@ -0,0 +1,3 @@
|
||||
#!/bin/bash
|
||||
|
||||
exec install-packages redhat-lsb
|
@ -4,6 +4,12 @@
|
||||
|
||||
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
|
||||
if ! getent passwd ec2-user ; then
|
||||
useradd -m -G admin ec2-user -s /bin/bash
|
||||
@ -23,4 +29,5 @@ Pin: release o=LP-PPA-tripleo-demo
|
||||
Pin-Priority: 900
|
||||
EOF
|
||||
# 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
|
||||
|
Loading…
Reference in New Issue
Block a user