openstack/puppet-openstack-integration
Code Issues Proposed changes

Invert the logic of Puppetfile

Browse Source 
I98fc088cd87c1412544f9590ce7a925b413297e2 broke unit 5.5 for
puppet-tripleo and probably puppet-pacemaker, since it can't find the
Puppetfile by default anymore.

Change-Id: I43718a849d09653e6c352b581aef6bbbf372fc41
This commit is contained in:
Emilien Macchi 2019-12-20 17:05:51 -05:00
parent b44d0bdd5a
commit 70ac070db1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Puppetfile
View File

@ -196,11 +196,11 @@ mod 'inifile',
mod 'mysql',
:git => 'https://github.com/puppetlabs/puppetlabs-mysql',
:ref => 'v10.3.0'
:ref => '6.2.0'
mod 'postgresql',
:git => 'https://github.com/puppetlabs/puppetlabs-postgresql',
:ref => 'v6.3.0'
:ref => 'v6.2.0'
mod 'rabbitmq',
:git => 'https://github.com/voxpupuli/puppet-rabbitmq',

2
Puppetfile_centos7 → Puppetfile_centos8
View File

@ -196,7 +196,7 @@ mod 'inifile',
mod 'mysql',
:git => 'https://github.com/puppetlabs/puppetlabs-mysql',
:ref => '6.2.0'
:ref => 'v10.3.0'
mod 'postgresql',
:git => 'https://github.com/puppetlabs/puppetlabs-postgresql',

2
external_modules.txt
View File

@ -8,7 +8,7 @@ puppetlabs/puppetlabs-apt,2.4.0
puppetlabs/puppetlabs-concat,2.2.1
puppetlabs/puppetlabs-firewall
puppetlabs/puppetlabs-inifile,2.2.0
puppetlabs/puppetlabs-mysql
puppetlabs/puppetlabs-mysql,6.2.0
puppetlabs/puppetlabs-postgresql
voxpupuli/puppet-rabbitmq
puppetlabs/puppetlabs-rsync

4
functions
View File

@ -10,8 +10,8 @@
# - ``GEM_BIN_DIR`` must be set to Gem bin directory
BASE_PUPPETFILE=Puppetfile
source /etc/os-release
if [[ "${REDHAT_SUPPORT_PRODUCT,,}" = "centos" && ${REDHAT_SUPPORT_PRODUCT_VERSION} = "7" ]]; then
BASE_PUPPETFILE=Puppetfile_centos7
if [[ "${REDHAT_SUPPORT_PRODUCT,,}" = "centos" && ${REDHAT_SUPPORT_PRODUCT_VERSION} = "8" ]]; then
BASE_PUPPETFILE=Puppetfile_centos8
fi
install_external() {
PUPPETFILE=${SCRIPT_DIR}/Puppetfile1 r10k -v DEBUG puppetfile install