Drop monit from fuel-master setup
Monit code can't be turned on and it isn't tested. Remove monit from fuel-master setup. Change-Id: Iaa0615d0ff11bbec306ec8d442da0a8d34d5a29e Closes-bug: #1554199
This commit is contained in:
parent
738e98ee24
commit
ce5ab3fdcc
|
@ -22,7 +22,6 @@ puppet/keystone
|
|||
puppet/mcollective
|
||||
puppet/memcached
|
||||
puppet/mongodb
|
||||
puppet/monit
|
||||
puppet/murano
|
||||
puppet/mysql
|
||||
puppet/neutron
|
||||
|
|
|
@ -116,11 +116,6 @@ mod 'rsync',
|
|||
:git => 'https://github.com/fuel-infra/puppetlabs-rsync.git',
|
||||
:ref => '0.4.0-mos-rc1'
|
||||
|
||||
# Pull in puppet-monit
|
||||
mod 'monit',
|
||||
:git => 'https://github.com/fuel-infra/puppet-monit.git',
|
||||
:ref => '1.0.0'
|
||||
|
||||
# Pull in puppet-filemapper
|
||||
mod 'filemapper',
|
||||
:git => 'https://github.com/fuel-infra/puppet-filemapper.git',
|
||||
|
|
|
@ -31,7 +31,6 @@ ensure_packages(["sudo", "ami-creator", "python-daemon", "httpd",
|
|||
"fuel-notify"])
|
||||
|
||||
Class['openstack::logrotate'] ->
|
||||
Class['monit'] ->
|
||||
Class['fuel::bootstrap_cli']
|
||||
|
||||
fuel::sshkeygen { '/root/.ssh/id_rsa':
|
||||
|
@ -99,12 +98,7 @@ service {'dhcrelay':
|
|||
ensure => stopped,
|
||||
}
|
||||
|
||||
# Enable monit
|
||||
class { 'monit': }
|
||||
|
||||
# Free disk space monitoring
|
||||
Package['fuel-notify'] ~> Service['monit']
|
||||
|
||||
file { '/etc/fuel/free_disk_check.yaml':
|
||||
content => template('fuel/free_disk_check.yaml.erb'),
|
||||
owner => 'root',
|
||||
|
|
|
@ -352,7 +352,6 @@ Release: %{release}
|
|||
Group: System Environment/Libraries
|
||||
# FIXME(aglarendil): mixed license actually - need to figure out the best option
|
||||
License: GPLv2
|
||||
Requires: monit
|
||||
Requires: python-six
|
||||
Requires: PyYAML
|
||||
Requires: python-fuelclient
|
||||
|
|
|
@ -49,8 +49,6 @@ describe manifest do
|
|||
)
|
||||
end
|
||||
|
||||
it { is_expected.to contain_class 'monit' }
|
||||
|
||||
it { is_expected.to contain_exec 'Change protocol and port in in issue' }
|
||||
|
||||
it { is_expected.to contain_service('dhcrelay').with(:ensure => 'stopped')}
|
||||
|
|
Loading…
Reference in New Issue