Revert "Deploy Monitoring on the undercloud with Puppet"
As has been agreed in the availability monitoring spec [1], Sensu support
on the undercloud level won't be supported. This patch removes the basic
Sensu deployment on undercloud node.
[1] https://github.com/openstack/tripleo-specs/blob/master/specs/newton/tripleo-opstools-availability-monitoring.rst
This reverts commit 5b10a84e95
.
Implements: blueprint tripleo-opstools-availability-monitoring
Change-Id: If7612b9bd7b6547fab474906499a45b21d4dd156
This commit is contained in:
parent
3a70958b57
commit
59300e8120
|
@ -518,26 +518,6 @@ if str2bool(hiera('enable_zaqar', true)) {
|
|||
}
|
||||
}
|
||||
|
||||
if str2bool(hiera('enable_monitoring', true)) {
|
||||
# Deploy Redis (event storage), Sensu (Monitoring server)
|
||||
# and Uchiwa (Sensu dashboard)
|
||||
include ::redis
|
||||
include ::sensu
|
||||
include ::uchiwa
|
||||
Service['sensu-api'] -> Service['uchiwa']
|
||||
Yumrepo['sensu'] -> Package['uchiwa']
|
||||
|
||||
# RDO packaging is WIP
|
||||
# https://trello.com/c/X9dJ0iTQ/110-monitoring-packaging
|
||||
# openstack-checks contains checks specific to OpenStack and Ceph.
|
||||
package { 'osops-tools-monitoring-oschecks':
|
||||
ensure => installed,
|
||||
provider => 'rpm',
|
||||
source => 'https://apevec.fedorapeople.org/openstack/ggillies/osops-tools-monitoring-oschecks-0.1-1.gitdd7ca5c.el7.centos.noarch.rpm',
|
||||
}
|
||||
Package['osops-tools-monitoring-oschecks'] -> Service['sensu-client']
|
||||
}
|
||||
|
||||
# dependency of pxe_drac
|
||||
ensure_resource('package', 'python-dracclient')
|
||||
# dependency of pxe_ilo
|
||||
|
|
|
@ -240,39 +240,6 @@ neutron::keystone::auth::admin_url: {{UNDERCLOUD_ENDPOINT_NEUTRON_ADMIN}}
|
|||
neutron::keystone::auth::password: {{UNDERCLOUD_NEUTRON_PASSWORD}}
|
||||
neutron::keystone::auth::region: "%{hiera('keystone_region')}"
|
||||
|
||||
# Monitoring
|
||||
# TODO(emilien) disable sensu repo when packaging ready
|
||||
uchiwa::install_repo: false
|
||||
uchiwa::sensu_api_endpoints:
|
||||
- name: 'Undercloud Server'
|
||||
host: {{LOCAL_IP}}
|
||||
ssl: false
|
||||
insecure: false
|
||||
port: 4567
|
||||
user: 'sensu'
|
||||
pass: {{UNDERCLOUD_SENSU_PASSWORD}}
|
||||
path: ''
|
||||
timeout: 5000
|
||||
|
||||
sensu::server: true
|
||||
sensu::install_repo: true
|
||||
sensu::manage_services: true
|
||||
sensu::manage_user: true
|
||||
sensu::rabbitmq_host: {{LOCAL_IP}}
|
||||
sensu::rabbitmq_vhost: '/'
|
||||
sensu::rabbitmq_user: {{UNDERCLOUD_RABBIT_USERNAME}}
|
||||
sensu::rabbitmq_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
|
||||
sensu::api: true
|
||||
sensu::api_user: 'sensu'
|
||||
sensu::api_password: {{UNDERCLOUD_SENSU_PASSWORD}}
|
||||
sensu::subscriptions:
|
||||
- 'undercloud'
|
||||
sensu::checks:
|
||||
'check_keystone-api':
|
||||
command: 'oschecks-check_keystone_api --os-auth-url "%{hiera(\"keystone_auth_uri_v2\")}" --os-username admin --os-password {{UNDERCLOUD_ADMIN_PASSWORD}} --os-tenant-name service'
|
||||
subscribers: 'undercloud'
|
||||
standalone: false
|
||||
|
||||
# Ceilometer
|
||||
ceilometer::expirer::time_to_live: undef
|
||||
ceilometer::metering_secret: {{UNDERCLOUD_CEILOMETER_METERING_SECRET}}
|
||||
|
@ -597,7 +564,6 @@ enable_validations: {{ENABLE_VALIDATIONS}}
|
|||
enable_telemetry: {{ENABLE_TELEMETRY}}
|
||||
enable_ui: {{ENABLE_UI}}
|
||||
ipxe_deploy: {{IPXE_DEPLOY}}
|
||||
enable_monitoring: {{ENABLE_MONITORING}}
|
||||
|
||||
# Path to install configuration files
|
||||
tripleo_install_user: {{TRIPLEO_INSTALL_USER}}
|
||||
|
|
|
@ -21,4 +21,3 @@ UNDERCLOUD_SWIFT_HASH_SUFFIX=$(sudo hiera swift::swift_hash_suffix)
|
|||
UNDERCLOUD_SWIFT_PASSWORD=$(sudo hiera swift::proxy::authtoken::admin_password)
|
||||
UNDERCLOUD_MISTRAL_PASSWORD=$(sudo hiera mistral::admin_password)
|
||||
UNDERCLOUD_ZAQAR_PASSWORD=$(sudo hiera zaqar::keystone::authtoken::password)
|
||||
UNDERCLOUD_SENSU_PASSWORD=$(sudo hiera sensu::api_password)
|
||||
|
|
|
@ -311,11 +311,6 @@ _opts = [
|
|||
default=True,
|
||||
help=('Whether to use iPXE for deploy by default.')
|
||||
),
|
||||
cfg.BoolOpt('enable_monitoring',
|
||||
default=False,
|
||||
help=('Whether to install Monitoring services in the '
|
||||
'Undercloud.')
|
||||
),
|
||||
cfg.BoolOpt('store_events',
|
||||
default=False,
|
||||
help=('Whether to store events in the Undercloud Ceilometer.')
|
||||
|
@ -423,10 +418,6 @@ _auth_opts = [
|
|||
help=('Swift hash suffix. '
|
||||
'If left unset, one will be automatically generated.')
|
||||
),
|
||||
cfg.StrOpt('undercloud_sensu_password',
|
||||
help=('Sensu service password. '
|
||||
'If left unset, one will be automatically generated.')
|
||||
),
|
||||
cfg.StrOpt('undercloud_haproxy_stats_password',
|
||||
help=('HAProxy stats password. '
|
||||
'If left unset, one will be automatically generated.')
|
||||
|
|
|
@ -161,9 +161,6 @@
|
|||
# Whether to use iPXE for deploy by default. (boolean value)
|
||||
#ipxe_deploy = true
|
||||
|
||||
# Whether to install Monitoring services in the Undercloud. (boolean
|
||||
# value)
|
||||
#enable_monitoring = false
|
||||
|
||||
# Whether to store events in the Undercloud Ceilometer. (boolean
|
||||
# value)
|
||||
|
|
Loading…
Reference in New Issue