Skip to content

Commit 6cc67dc

Browse files
authored
BIGTOP-4148. Replace adding repo in puppetize.sh with puppet manifest (#1283)
1 parent 9fe9c32 commit 6cc67dc

File tree

5 files changed

+80
-6
lines changed

5 files changed

+80
-6
lines changed

bigtop-deploy/puppet/manifests/jdk.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
}
4343
}
4444
/(CentOS|Amazon|Fedora|RedHat|Rocky|openEuler)/: {
45+
require yumrepo
4546
package { 'jdk':
4647
name => 'java-1.8.0-openjdk-devel',
4748
ensure => present,

bigtop-deploy/puppet/manifests/python.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
class python {
1717
case $operatingsystem {
1818
/(?i:(centos|fedora|redhat|rocky))/: {
19+
require yumrepo
1920
package { 'python3-devel':
2021
ensure => 'present',
2122
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
class yumrepo {
17+
case $::operatingsystem {
18+
/(Rocky)/: {
19+
package { 'epel-release':
20+
ensure => installed,
21+
}
22+
if versioncmp($operatingsystemmajrelease, '8') == 0 {
23+
# On Rocky 8, EPEL requires that the PowerTools repository is enabled.
24+
# See https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F
25+
yumrepo { 'powertools':
26+
ensure => 'present',
27+
enabled => '1'
28+
}
29+
yumrepo { 'devel':
30+
ensure => 'present',
31+
enabled => '1'
32+
}
33+
}
34+
if versioncmp($operatingsystemmajrelease, '9') == 0 {
35+
# On Rocky 9, EPEL requires that the crb repository is enabled.
36+
yumrepo { 'crb':
37+
ensure => 'present',
38+
enabled => '1'
39+
}
40+
yumrepo { 'devel':
41+
ensure => 'present',
42+
enabled => '1'
43+
}
44+
}
45+
}
46+
}
47+
}

bigtop_toolchain/bin/puppetize.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,13 @@ case ${ID}-${VERSION_ID} in
5858
dnf -y install glibc-langpack-en hostname diffutils curl sudo unzip wget puppet procps-ng 'dnf-command(config-manager)'
5959
# Install the module in the same way as Fedora 31 and CentOS 7 for compatibility issues.
6060
puppet module install puppetlabs-stdlib --version 4.12.0
61-
# Enabling the PowerTools and EPEL repositories via Puppet doesn't seem to work in some cases.
62-
# As a workaround for that, enable the former here in advance of running the Puppet manifests.
63-
dnf config-manager --set-enabled powertools devel
6461
;;
6562
rocky-9*)
6663
rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
6764
dnf -y check-update
6865
dnf -y install glibc-langpack-en hostname diffutils sudo unzip wget puppet procps-ng 'dnf-command(config-manager)'
6966
# Install the module in the same way as Fedora 31 and CentOS 7 for compatibility issues.
7067
puppet module install puppetlabs-stdlib --version 4.12.0
71-
# Enabling the PowerTools and EPEL repositories via Puppet doesn't seem to work in some cases.
72-
# As a workaround for that, enable the former here in advance of running the Puppet manifests.
73-
dnf config-manager --set-enabled crb devel
7468
;;
7569
rhel-8*)
7670
rpm -Uvh https://yum.puppet.com/puppet5-release-el-8.noarch.rpm

bigtop_toolchain/manifests/packages.pp

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,37 @@
348348
}
349349
}
350350
}
351+
if $operatingsystem == 'Rocky' {
352+
package { 'epel-release':
353+
ensure => installed,
354+
notify => Package[$pkgs]
355+
}
356+
if versioncmp($operatingsystemmajrelease, '8') == 0 {
357+
# On Rocky 8, EPEL requires that the PowerTools repository is enabled.
358+
# See https://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F
359+
yumrepo { 'powertools':
360+
ensure => 'present',
361+
enabled => '1'
362+
}
363+
yumrepo { 'devel':
364+
ensure => 'present',
365+
enabled => '1'
366+
}
367+
Yumrepo<||> -> Package<||>
368+
}
369+
if versioncmp($operatingsystemmajrelease, '9') == 0 {
370+
# On Rocky 9, EPEL requires that the crb repository is enabled.
371+
yumrepo { 'crb':
372+
ensure => 'present',
373+
enabled => '1'
374+
}
375+
yumrepo { 'devel':
376+
ensure => 'present',
377+
enabled => '1'
378+
}
379+
Yumrepo<||> -> Package<||>
380+
}
381+
}
351382

352383

353384
if $osfamily == 'RedHat' {

0 commit comments

Comments
 (0)