Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: finn-no/puppet-confluent
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: keynetics/puppet-confluent
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 20, 2016

  1. added option to manage package repo locally

    Tom E. Tomlinson committed Dec 20, 2016

    Verified

    This commit was signed with the committer’s verified signature.
    brandonkelly Brandon Kelly
    GPG key ID: 5E86D0CED64C7093
    Verified
    Learn about vigilant mode
    Copy the full SHA
    095e9a6 View commit details

  2. added apt-get update to run no matter what

    Tom E. Tomlinson committed Dec 20, 2016
    Copy the full SHA
    7ee571f View commit details
Showing with 29 additions and 24 deletions.
  1. +4 −0 manifests/init.pp
  2. +14 −13 manifests/repo/apt.pp
  3. +11 −11 manifests/repo/yum.pp
4 changes: 4 additions & 0 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,9 @@
$schema_registry = false,
$kafka_rest = false,

#repo management
$manage_package_repo = true,

#specific tuning, JVM/JMX and propertyfiles in particular
$kafka_server_opts = '', #For instance, JVM options, excluding JVM opts
$kafka_server_heap_opts = '',
@@ -37,6 +40,7 @@
$connect_avro_distributed_properties = {},
$connect_avro_standalone_properties = {},
$schema_registry_log4j_properties = {},
$manage_repo = {},
) {

#Not exepected to change
27 changes: 14 additions & 13 deletions manifests/repo/apt.pp
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
class confluent::repo::apt {

apt::key { 'confluent':
id => '1A77041E0314E6C5A486524E670540C841468433',
#server => 'pgp.mit.edu',
content => template('confluent/repo/archive.key.erb'),
} ->
if ($::confluent::manage_package_repo) {
apt::key { 'confluent':
id => '1A77041E0314E6C5A486524E670540C841468433',
#server => 'pgp.mit.edu',
content => template('confluent/repo/archive.key.erb'),
} ->

file { '/etc/apt/sources.list.d/confluent.list':
ensure => file,
content => "deb [arch=amd64] http://packages.confluent.io/deb/3.1 stable main",
mode => '0644',
notify => Exec['repo update'],
file { '/etc/apt/sources.list.d/confluent.list':
ensure => file,
content => "deb [arch=amd64] http://packages.confluent.io/deb/3.1 stable main",
mode => '0644',
notify => Exec['repo update'],
}
}

exec { 'repo update':
path => '/usr/sbin:/usr/bin:/sbin:/bin',
command => 'apt-get -y update',
refreshonly => true,
refreshonly => true,
}

}
22 changes: 11 additions & 11 deletions manifests/repo/yum.pp
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
class confluent::repo::yum {
if ($::confluent::manage_package_repo) {
file { '/etc/yum.repos.d/confluent.repo':
ensure => file,
content => template('confluent/repo/yum.erb'),
mode => '0644',
} ->

file { '/etc/yum.repos.d/confluent.repo':
ensure => file,
content => template('confluent/repo/yum.erb'),
mode => '0644',
} ->

exec { 'repo update':
user => 'root',
path => '/usr/bin:/bin:/usr/sbin:/sbin',
command => 'yum clean all',
exec { 'repo update':
user => 'root',
path => '/usr/bin:/bin:/usr/sbin:/sbin',
command => 'yum clean all',
}
}

}