Skip to content

Commit

Permalink
Merge 2bec33b into acddaa3
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Hoolboom committed Sep 14, 2015
2 parents acddaa3 + 2bec33b commit 2f7e747
Show file tree
Hide file tree
Showing 8 changed files with 81 additions and 11 deletions.
21 changes: 20 additions & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,23 @@
$syslog_protocol = 'udp',
$syslog_port = 514,
$syslog_facility = 'local7',
) { }
) {

# The hackery is strong. Not sure where else to hack this in.
if $::osfamily == "RedHat" {
file{'/etc/facter':
ensure => 'directory',
owner => 'root',
group => 'root',
mode => '0444'
}

file{'/etc/facter/facts.d':
ensure => 'directory',
owner => 'root',
group => 'root',
mode => '0444',
require => File['/etc/facter']
}
}
}
7 changes: 6 additions & 1 deletion manifests/package/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,12 @@
undef => st2_latest_stable_revision($_version, $_type),
default => $revision,
}
$_package_version = "${_version}-${_revision}"
# Temporary Hack while fixing build pipeline
if $name =~ /client/ {
$_package_version = "${_version}.${_revision}-1"
} else {
$_package_version = "${_version}-${_revision}"
}
}
default: { fail("Class[st2::package]: $st2::notice::unsupported_os") }
}
Expand Down
4 changes: 2 additions & 2 deletions manifests/package/redhat.pp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
$version = $::st2::version,
) inherits st2 {
$_os = downcase($::operatingsystem)
$_osver = $::operatingsystemrelease
$_osver = $::operatingsystemmajrelease

if $version =~ /dev$/ {
$_suite = "unstable"
Expand All @@ -21,7 +21,7 @@

yumrepo { 'stackstorm':
ensure => present,
baseurl => "https://downloads.stackstorm.net/rpm/${_os}/${_osver}/${_suite}",
baseurl => "https://downloads.stackstorm.net/rpm/el/${_osver}/${_suite}",
descr => 'StackStorm RPM Repository',
enabled => 1,
gpgcheck => 0,
Expand Down
20 changes: 17 additions & 3 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,23 @@
'st2auth',
'st2debug',
]
$st2_client_packages = [
'python-st2client',
]
case $::osfamily {
'Debian': {
$st2_client_packages = [
'python-st2client',
]
}
'RedHat': {
$st2_client_packages = [
'st2client',
]
}
default: {
$st2_client_packages = [
'python-st2client',
]
}
}

### Debian Specific Information ###
$debian_dependencies = [
Expand Down
2 changes: 1 addition & 1 deletion manifests/profile/mistral.pp
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
owner => 'root',
group => 'root',
mode => '0444',
content => template('st2/etc/systemd/mistral.service.erb'),
content => template('st2/etc/systemd/system/mistral.service.erb'),
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion manifests/profile/mongodb.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,19 @@
include '::st2::params'

if !defined(Class['::mongodb::server']) {
class { '::mongodb::server': }
if $::osfamily == "RedHat" {
require epel
class {'::mongodb::server': }->
class {'::mongodb::client': }

}else{
class { '::mongodb::server': }
}
}

$_mongodb_dependencies = $::osfamily ? {
'Debian' => $::st2::params::debian_mongodb_dependencies,
'RedHat' => $::st2::params::redhat_mongodb_dependencies,
default => undef,
}

Expand Down
22 changes: 22 additions & 0 deletions manifests/profile/rabbitmq.pp
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,26 @@
package_apt_pin => '100',
}
}

if $::osfamily == "RedHat" {
class {'::erlang': }

case $::operatingsystemmajrelease {
'7': {
yumrepo { 'erlang-solutions':
ensure => present,
baseurl => "http://packages.erlang-solutions.com/rpm/centos/\$releasever/\$basearch",
descr => 'Centos $releasever - $basearch - Erlang Solutions',
enabled => 1,
gpgcheck => 0,
}
Yumrepo['erlang-solutions']
-> Class['::erlang']
-> Class['::rabbitmq']
}
'6': {
Class['erlang'] -> Class['::rabbitmq']
}
}
}
}
6 changes: 4 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@
{"name":"stankevich-python","version_requirement":">= 1.7.15"},
{"name":"puppetlabs-gcc","version_requirement":">= 0.2.0"},
{"name":"puppetlabs-inifile","version_requirement":">= 1.2.0"},
{"name":"puppetlabs-mongodb","version_requirement":">= 0.8.0"},
{"name":"puppetlabs-mongodb","version_requirement":">= 0.11.0"},
{"name":"puppetlabs-postgresql","version_requirement":">= 4.4.2"},
{"name":"puppetlabs-rabbitmq","version_requirement":">= 4.1.0"},
{"name":"puppetlabs-vcsrepo","version_requirement":">= 1.2.0"},
{"name":"jfryman-tiller","version_requirement":">= 0.1.0"}
{"name":"jfryman-tiller","version_requirement":">= 0.1.0"},
{"name":"garethr-erlang","version_requirement":">= 0.3.0"},
{"name":"stahnma-epel","version_requirement":">= 1.1.1"}
]
}

0 comments on commit 2f7e747

Please sign in to comment.