openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Another Debian patch 

This patch adds apt-transport-https to the list of things to install
before starting, as apt-transport-https isn't installed by default
in Debian. It also replaces the hardcoded "xenial" by
{{ ansible_distribution_release }}. Note that the later will also
help when switching from Xenial to Bionic.

Change-Id: I2e692c62162486be6506ba67cbb4d887262994b2
This commit is contained in:
Thomas Goirand 2018-03-19 22:37:48 +01:00
parent 26e45e9dbe
commit 2e351cffb5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all-in-one.sh
View File

@ -50,7 +50,7 @@ elif uses_debs; then
print_header 'Setup (Debian based)'
sudo apt-get remove -y --purge facter puppet puppet-common
sudo apt-get update
sudo apt-get install -y libxml2-dev libxslt-dev zlib1g-dev ruby wget lsb-release curl
sudo apt-get install -y libxml2-dev libxslt-dev zlib1g-dev ruby wget lsb-release curl apt-transport-https
DASHBOARD="horizon"
fi

2
playbooks/prepare-node-common.yaml
View File

@ -48,7 +48,7 @@
yum install -y https://yum.puppetlabs.com/puppetlabs-release-pc1-el-7.noarch.rpm
yum install -y puppet-agent
elif [ -f /usr/bin/apt-get ]; then
wget https://apt.puppetlabs.com/puppetlabs-release-pc1-xenial.deb -O /tmp/puppet.deb
wget https://apt.puppetlabs.com/puppetlabs-release-pc1-{{ ansible_distribution_release }}.deb -O /tmp/puppet.deb
dpkg -i /tmp/puppet.deb
apt-get update
apt-get install puppet-agent