From b3ffd695fd73412a07ed21a7e1744469e4436535 Mon Sep 17 00:00:00 2001 From: Martin Magr Date: Wed, 25 Sep 2019 10:49:13 +0200 Subject: [PATCH] Remove sensu-client service Sensu client has been deprecated and it's functionality substituted by collectd-sensubility. This patch removes sensu-client composable service Change-Id: I4be68eb7319b2c92cc7d0fc9df7a5c87dfb5106c --- README.rst | 2 - .../scenario001-multinode-containers.yaml | 8 - ci/environments/scenario001-standalone.yaml | 8 - ci/environments/scenario004-standalone.yaml | 7 - ci/environments/scenario010-standalone.yaml | 7 - .../deployed-server-roles-data.yaml | 5 - .../deprecated/monitoring/sensu-base.yaml | 117 -------- .../sensu-client-container-puppet.yaml | 261 ------------------ environments/computealt.yaml | 3 - environments/hyperconverged-ceph.yaml | 1 - environments/monitoring-environment.yaml | 18 -- .../services-baremetal/sensu-client.yaml | 3 - environments/services/sensu-client.yaml | 3 - .../undercloud/undercloud-minion.yaml | 1 - overcloud-resource-registry-puppet.j2.yaml | 1 - overcloud.j2.yaml | 1 - roles/BlockStorage.yaml | 1 - roles/CellController.yaml | 1 - roles/CephAll.yaml | 1 - roles/CephFile.yaml | 1 - roles/CephObject.yaml | 1 - roles/CephStorage.yaml | 1 - roles/Compute.yaml | 1 - roles/ComputeAlt.yaml | 1 - roles/ComputeDVR.yaml | 1 - roles/ComputeHCI.yaml | 1 - roles/ComputeHCIOvsDpdk.yaml | 1 - roles/ComputeInstanceHA.yaml | 1 - roles/ComputeLiquidio.yaml | 1 - roles/ComputeLocalEphemeral.yaml | 1 - roles/ComputeOvsDpdk.yaml | 1 - roles/ComputeOvsDpdkRT.yaml | 1 - roles/ComputeOvsDpdkSriov.yaml | 1 - roles/ComputeOvsDpdkSriovRT.yaml | 1 - roles/ComputePPC64LE.yaml | 1 - roles/ComputeRBDEphemeral.yaml | 1 - roles/ComputeRealTime.yaml | 1 - roles/ComputeSriov.yaml | 1 - roles/ComputeSriovRT.yaml | 1 - roles/Controller.yaml | 1 - roles/ControllerAllNovaStandalone.yaml | 1 - roles/ControllerNoCeph.yaml | 1 - roles/ControllerNovaStandalone.yaml | 1 - roles/ControllerOpenstack.yaml | 1 - roles/ControllerStorageDashboard.yaml | 1 - roles/ControllerStorageNfs.yaml | 1 - roles/Database.yaml | 1 - roles/DistributedCompute.yaml | 1 - roles/DistributedComputeHCI.yaml | 1 - roles/HciCephAll.yaml | 1 - roles/HciCephFile.yaml | 1 - roles/HciCephMon.yaml | 1 - roles/HciCephObject.yaml | 1 - roles/IronicConductor.yaml | 1 - roles/Messaging.yaml | 1 - roles/Networker.yaml | 1 - roles/Novacontrol.yaml | 1 - roles/ObjectStorage.yaml | 1 - roles/README.rst | 1 - roles/Standalone.yaml | 1 - roles/Telemetry.yaml | 1 - roles_data.yaml | 5 - sample-env-generator/undercloud-minion.yaml | 1 - 63 files changed, 497 deletions(-) delete mode 100644 deployment/deprecated/monitoring/sensu-base.yaml delete mode 100644 deployment/deprecated/monitoring/sensu-client-container-puppet.yaml delete mode 100644 environments/monitoring-environment.yaml delete mode 100644 environments/services-baremetal/sensu-client.yaml delete mode 100644 environments/services/sensu-client.yaml diff --git a/README.rst b/README.rst index 4b24cbb1fc..65a6bdea8b 100644 --- a/README.rst +++ b/README.rst @@ -136,8 +136,6 @@ and should be executed according to the following table: +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | collectd | | X | | | | | | | | | | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ -| sensu-client | | X | | | | | | | | | | -+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | designate | | | | X | | | | | | | | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | octavia | | | | | | | | | X | | | diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 5db39223ce..83bddeb8a1 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -20,10 +20,6 @@ resource_registry: OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-pacemaker-puppet.yaml OS::TripleO::Services::Keepalived: OS::Heat::None #Needs to run scenario001 - # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based - # on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we - # will implement default connection to overcloud RabbitMQ instance, - #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml @@ -92,7 +88,6 @@ parameter_defaults: - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::TripleoFirewall - #- OS::TripleO::Services::SensuClient - OS::TripleO::Services::Iscsid - OS::TripleO::Services::Multipathd @@ -167,9 +162,6 @@ parameter_defaults: LoggingServers: - host: 127.0.0.1 port: 24224 - #MonitoringRabbitHost: 127.0.0.1 - #MonitoringRabbitPort: 5676 - #MonitoringRabbitPassword: sensu RsyslogElasticsearchSetting: Server: '127.0.0.1:9200' TtyValues: diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 6c830bfe53..3b929cc15a 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -25,11 +25,6 @@ resource_registry: OS::TripleO::Services::Redis: ../../deployment/database/redis-container-puppet.yaml OS::TripleO::Services::CinderBackup: ../../deployment/cinder/cinder-backup-container-puppet.yaml OS::TripleO::Services::CinderVolume: ../../deployment/cinder/cinder-volume-container-puppet.yaml - #Needs to run scenario001 - # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based - # on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we - # will implement default connection to overcloud RabbitMQ instance, - #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml @@ -114,9 +109,6 @@ parameter_defaults: LoggingServers: - host: 127.0.0.1 port: 24224 - MonitoringRabbitHost: 127.0.0.1 - MonitoringRabbitPort: 5676 - MonitoringRabbitPassword: sensu TtyValues: - console - tty1 diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index d75dc1fe47..755c93f464 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -28,10 +28,6 @@ resource_registry: OS::TripleO::Services::MySQL: ../../deployment/database/mysql-pacemaker-puppet.yaml OS::TripleO::Services::LoginDefs: ../../deployment/login-defs/login-defs-baremetal.yaml OS::TripleO::Services::Keepalived: OS::Heat::None - # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based - # on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we - # will implement default connection to overcloud RabbitMQ instance, - #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml @@ -91,9 +87,6 @@ parameter_defaults: LoggingServers: - host: 127.0.0.1 port: 24224 - MonitoringRabbitHost: 127.0.0.1 - MonitoringRabbitPort: 5676 - MonitoringRabbitPassword: sensu TtyValues: - console - tty1 diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml index 2dec03a377..dcc2c856b9 100644 --- a/ci/environments/scenario010-standalone.yaml +++ b/ci/environments/scenario010-standalone.yaml @@ -6,10 +6,6 @@ resource_registry: OS::TripleO::Services::Keepalived: OS::Heat::None OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml - # NOTE(mmagr): We need to disable Sensu client deployment for now as the container health check is based - # on successful RabbitMQ connection, which does not happen in this case. We can enable it again when we - # will implement default connection to overcloud RabbitMQ instance, - #OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml @@ -87,9 +83,6 @@ parameter_defaults: LoggingServers: - host: 127.0.0.1 port: 24224 - MonitoringRabbitHost: 127.0.0.1 - MonitoringRabbitPort: 5676 - MonitoringRabbitPassword: sensu TtyValues: - console - tty1 diff --git a/deployed-server/deployed-server-roles-data.yaml b/deployed-server/deployed-server-roles-data.yaml index d9901329d4..c191b9411e 100644 --- a/deployed-server/deployed-server-roles-data.yaml +++ b/deployed-server/deployed-server-roles-data.yaml @@ -172,7 +172,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp @@ -260,7 +259,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd @@ -313,7 +311,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync @@ -366,7 +363,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::SwiftRingBuilder @@ -414,7 +410,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/deployment/deprecated/monitoring/sensu-base.yaml b/deployment/deprecated/monitoring/sensu-base.yaml deleted file mode 100644 index 867967bdc2..0000000000 --- a/deployment/deprecated/monitoring/sensu-base.yaml +++ /dev/null @@ -1,117 +0,0 @@ -heat_template_version: rocky - -description: Sensu base service - -parameters: - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - MonitoringRabbitCluster: - description: RabbitMQ cluster configuration Sensu has to connect to. - type: json - default: [] - MonitoringRabbitHost: - description: RabbitMQ host Sensu has to connect to. - type: string - default: '' - MonitoringRabbitPort: - default: 5672 - description: Set RabbitMQ subscriber port, change this if using SSL. - type: number - MonitoringRabbitUseSSL: - default: false - description: > - RabbitMQ client subscriber parameter to specify an SSL connection - to the RabbitMQ host. Set MonitoringRabbitUseSSL to true without - specifying a private key or cert chain to use SSL transport, - but not cert auth. - type: boolean - MonitoringRabbitSSLPrivateKey: - default: '' - description: Private key to be used by Sensu to connect to RabbitMQ host. - type: string - MonitoringRabbitSSLCertChain: - default: '' - description: > - Private SSL cert chain to be used by Sensu to connect to RabbitMQ host. - type: string - MonitoringRabbitPassword: - description: The RabbitMQ password used for monitoring purposes. - type: string - hidden: true - default: sensu - MonitoringRabbitUserName: - description: The RabbitMQ username used for monitoring purposes. - type: string - default: sensu - MonitoringRabbitVhost: - description: The RabbitMQ vhost used for monitoring purposes. - type: string - default: '/sensu' - SensuRedactVariables: - description: Variables from Sensu configuration, which have to be redacted. - type: comma_delimited_list - default: - - password - - passwd - - pass - - api_key - - api_token - - access_key - - secret_key - - private_key - - secret - -conditions: - not_cluster_connection: - equals: [{get_param: MonitoringRabbitCluster}, []] - -outputs: - role_data: - description: Role data for the Sensu role. - value: - service_name: sensu_base - config_settings: - map_merge: - - sensu::enterprise: false - sensu::enterprise_dashboard: false - sensu::install_repo: false - sensu::manage_user: false - sensu::redact: {get_param: SensuRedactVariables} - sensu::sensu_plugin_provider: 'yum' - sensu::sensu_plugin_name: 'rubygem-sensu-plugin' - sensu::version: 'present' - - if: - - not_cluster_connection - - sensu::rabbitmq_host: {get_param: MonitoringRabbitHost} - sensu::rabbitmq_port: {get_param: MonitoringRabbitPort} - sensu::rabbitmq_user: {get_param: MonitoringRabbitUserName} - sensu::rabbitmq_password: {get_param: MonitoringRabbitPassword} - sensu::rabbitmq_vhost: {get_param: MonitoringRabbitVhost} - sensu::rabbitmq_ssl: {get_param: MonitoringRabbitUseSSL} - sensu::rabbitmq_ssl_private_key: {get_param: MonitoringRabbitSSLPrivateKey} - sensu::rabbitmq_ssl_cert_chain: {get_param: MonitoringRabbitSSLCertChain} - - sensu::rabbitmq_cluster: {get_param: MonitoringRabbitCluster} diff --git a/deployment/deprecated/monitoring/sensu-client-container-puppet.yaml b/deployment/deprecated/monitoring/sensu-client-container-puppet.yaml deleted file mode 100644 index b5b671d690..0000000000 --- a/deployment/deprecated/monitoring/sensu-client-container-puppet.yaml +++ /dev/null @@ -1,261 +0,0 @@ -heat_template_version: rocky - -description: > - Containerized Sensu client service. - This service is deprecated and will be remove in future releases. - -parameters: - ContainerSensuClientImage: - description: image - type: string - ContainerSensuConfigImage: - description: The container image to use for the sensu config_volume - type: string - EndpointMap: - default: {} - description: Mapping of service endpoint -> protocol. Typically set - via parameter_defaults in the resource registry. - type: json - ServiceData: - default: {} - description: Dictionary packing service data - type: json - ServiceNetMap: - default: {} - description: Mapping of service_name -> network name. Typically set - via parameter_defaults in the resource registry. This - mapping overrides those in ServiceNetMapDefaults. - type: json - DefaultPasswords: - default: {} - type: json - RoleName: - default: '' - description: Role name on which the service is applied - type: string - RoleParameters: - default: {} - description: Parameters specific to the role - type: json - SensuDockerCheckCommand: - type: string - default: | - output='' - for i in $(docker ps --format '{{.ID}}'); do - if result=$(docker inspect --format='{{.State.Health.Status}}' $i 2>/dev/null); then - if [ "$result" != 'healthy' ]; then - output="${output} ; $(docker inspect --format='{{.Name}}' $i) ($i): $(docker inspect --format='{{(index .State.Health.Log 0).Output}}' $i)"; - fi - fi - done - if [ ! -z "${output}" ]; then - echo ${output:3} && exit 2; - fi - SensuPodmanCheckCommand: - type: string - default: | - output='' - for i in $(systemctl list-timers --no-pager --no-legend "tripleo*healthcheck.timer" | awk '{print $14}'); do - i=${i%.timer} - if result=$(systemctl show $i --property=ActiveState | awk '{split($0,a,/=/); print a[2]}'); then - if [ "$result" == 'failed' ]; then - timestamp=$(systemctl show $i --property=InactiveEnterTimestamp | awk '{print $2, $3}' ) - log=$(journalctl -u $i -t podman --since "${timestamp}" --no-pager --output=cat --directory /var/log/journal) - if [ ! -z "$output" ]; then - output="$i: $log ; $output" - else - output="$i: $log" - fi - fi - fi - done - if [ ! -z "${output}" ]; then - echo ${output:3} && exit 2; - fi - SensuDockerCheckInterval: - type: number - description: The frequency in seconds the docker health check is executed. - default: 10 - SensuDockerCheckHandlers: - default: [] - description: The Sensu event handler to use for events - created by the docker health check. - type: comma_delimited_list - SensuDockerCheckOccurrences: - type: number - description: The number of event occurrences before sensu-plugin-aware handler should take action. - default: 3 - SensuDockerCheckRefresh: - type: number - description: The number of seconds sensu-plugin-aware handlers should wait before taking second action. - default: 90 - ContainerCli: - type: string - default: 'podman' - description: CLI tool used to manage containers. - constraints: - - allowed_values: ['docker', 'podman'] - AdminPassword: - description: The password for the keystone admin account, used for monitoring, querying neutron etc. - type: string - hidden: true - KeystoneRegion: - default: 'regionOne' - description: Keystone region for endpoint - type: string - SensuClientCustomConfig: - default: {} - description: Hash containing custom sensu-client variables. - type: json - label: Custom configuration for Sensu Client variables - -conditions: - docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']} - -resources: - ContainersCommon: - type: ../../containers-common.yaml - - SensuBase: - type: ./sensu-base.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - DefaultPasswords: {get_param: DefaultPasswords} - EndpointMap: {get_param: EndpointMap} - RoleName: {get_param: RoleName} - RoleParameters: {get_param: RoleParameters} - -outputs: - role_data: - description: Role data for the Sensu client role. - value: - service_name: sensu_client - config_settings: - map_merge: - - get_attr: [SensuBase, role_data, config_settings] - - sensu::api: false - sensu::client: true - sensu::server: false - sensu::client_custom: - map_merge: - - {get_param: SensuClientCustomConfig} - - openstack: - username: 'admin' - password: {get_param: AdminPassword} - auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} - tenant_name: 'admin' - region: {get_param: KeystoneRegion} - - sensu::checks: - check-container-health: - standalone: true - command: - if: - - docker_enabled - - {get_param: SensuDockerCheckCommand} - - {get_param: SensuPodmanCheckCommand} - interval: {get_param: SensuDockerCheckInterval} - handlers: {get_param: SensuDockerCheckHandlers} - occurrences: {get_param: SensuDockerCheckOccurrences} - refresh: {get_param: SensuDockerCheckRefresh} - service_config_settings: {} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: sensu - puppet_tags: sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check - step_config: include ::tripleo::profile::base::monitoring::sensu - config_image: {get_param: ContainerSensuConfigImage} - kolla_config: - /var/lib/kolla/config_files/sensu-client.json: - command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log - config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: - - path: /var/log/sensu - owner: sensu:sensu - recurse: true - docker_config: - step_3: - sensu_client: - image: {get_param: ContainerSensuClientImage} - net: host - pid: host - # NOTE(mmagr) kolla image changes the user to 'sensu', we need it - # to be root have rw permission to docker.sock to run successfully - # "docker inspect" command - user: root - restart: always - healthcheck: - test: - list_join: - - ' ' - - - '/openstack/healthcheck' - - yaql: - expression: > - switch(bool($.data.cluster) => $.data.cluster, bool($.data.single_node) => $.data.single_node).select($.port).distinct().join(' ') - data: - cluster: {get_attr: [SensuBase, role_data, config_settings, 'sensu::rabbitmq_cluster']} - single_node: [{port: {get_attr: [SensuBase, role_data, config_settings, 'sensu::rabbitmq_port']}}] - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - if: - - docker_enabled - - - /var/run/docker.sock:/var/run/docker.sock:rw - - - /var/log/journal:/var/log/journal:ro - - /sys/fs/cgroup:/sys/fs/cgroup:ro - - /run:/run:rw - - /usr/lib/systemd/system:/usr/lib/systemd/system:ro - - - /var/lib/kolla/config_files/sensu-client.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/sensu/:/var/lib/kolla/config_files/src:ro - - /var/log/containers/sensu:/var/log/sensu:rw - environment: - - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS - host_prep_tasks: - - name: create persistent directories - file: - path: "{{ item.path }}" - state: directory - setype: "{{ item.setype }}" - with_items: - - { 'path': /var/log/containers/sensu, 'setype': svirt_sandbox_file_t } - - { 'path': /var/log/sensu, 'setype': svirt_sandbox_file_t } - - name: sensu logs readme - copy: - dest: /var/log/sensu/readme.txt - content: | - Log files from sensu containers can be found under - /var/log/containers/sensu. - ignore_errors: true - # TODO: Removal of package - upgrade_tasks: [] - post_upgrade_tasks: - - when: step|int == 1 - import_role: - name: tripleo-docker-rm - vars: - containers_to_rm: - - sensu_client - tripleo_container_cli: "docker" - fast_forward_upgrade_tasks: - - when: - - step|int == 0 - - release == 'ocata' - block: - - name: Check if sensu client is deployed - command: systemctl is-enabled --quiet sensu-client - ignore_errors: True - register: sensu_enabled_result - - name: Set fact sensu_enabled - set_fact: - sensu_enabled: "{{ sensu_enabled_result.rc == 0 }}" - - name: Stop and disable sensu-client service - when: - - step|int == 1 - - release == 'ocata' - - sensu_enabled|bool - service: name=sensu-client state=stopped enabled=no diff --git a/environments/computealt.yaml b/environments/computealt.yaml index 801d42cbb0..50428af589 100644 --- a/environments/computealt.yaml +++ b/environments/computealt.yaml @@ -8,9 +8,6 @@ resource_registry: OS::TripleO::Services::NovaComputeAlt: ../deployment/nova/nova-compute-container-puppet.yaml OS::TripleO::Services::NovaLibvirtAlt: ../deployment/nova/nova-libvirt-container-puppet.yaml OS::TripleO::Services::NovaMigrationTargetAlt: ../deployment/nova/nova-migration-target-container-puppet.yaml - OS::TripleO::Services::SensuClientAlt: OS::Heat::None - # If enabling monitoring you'll need provide the following in a specific resource_registry - # OS::TripleO::Services::SensuClientAlt: ../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml OS::TripleO::Services::OVNControllerAlt: OS::Heat::None # If enabling OVN you'll need provide the following in a specific resource_registry # OS::TripleO::Services::OVNControllerAlt: ../puppet/services/ovn-controller.yaml diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index b6cb7f97d0..cd726e55a1 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -42,7 +42,6 @@ parameter_defaults: - OS::TripleO::Services::TripleoFirewall - OS::TripleO::Services::Tuned - OS::TripleO::Services::OpenDaylightOvs - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::IpaClient - OS::TripleO::Services::Ipsec diff --git a/environments/monitoring-environment.yaml b/environments/monitoring-environment.yaml deleted file mode 100644 index c34cd3458f..0000000000 --- a/environments/monitoring-environment.yaml +++ /dev/null @@ -1,18 +0,0 @@ -## DEPRECATED -## Sensu service is deprecated and will be removed in future releases. -## A Heat environment file which can be used to set up monitoring agents - -resource_registry: - OS::TripleO::Services::SensuClient: ../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml - -#parameter_defaults: -# MonitoringRabbitHost: 10.10.10.10 -# MonitoringRabbitPort: 5672 -# MonitoringRabbitUserName: sensu -# MonitoringRabbitPassword: sensu -# MonitoringRabbitUseSSL: false -# MonitoringRabbitVhost: "/sensu" -# SensuClientCustomConfig: -# api: -# warning: 10 -# critical: 20 diff --git a/environments/services-baremetal/sensu-client.yaml b/environments/services-baremetal/sensu-client.yaml deleted file mode 100644 index e1b17a0cf5..0000000000 --- a/environments/services-baremetal/sensu-client.yaml +++ /dev/null @@ -1,3 +0,0 @@ - -resource_registry: - OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml diff --git a/environments/services/sensu-client.yaml b/environments/services/sensu-client.yaml deleted file mode 100644 index e1b17a0cf5..0000000000 --- a/environments/services/sensu-client.yaml +++ /dev/null @@ -1,3 +0,0 @@ - -resource_registry: - OS::TripleO::Services::SensuClient: ../../deployment/deprecated/monitoring/sensu-client-container-puppet.yaml diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index 1c83293c6a..a86dd6a278 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -221,7 +221,6 @@ resource_registry: OS::TripleO::Services::SaharaApi: OS::Heat::None OS::TripleO::Services::SaharaEngine: OS::Heat::None OS::TripleO::Services::Securetty: OS::Heat::None - OS::TripleO::Services::SensuClient: OS::Heat::None OS::TripleO::Services::SkydiveAgent: OS::Heat::None OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None OS::TripleO::Services::Snmp: OS::Heat::None diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index c4a10c0e5b..c42c009644 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -278,7 +278,6 @@ resource_registry: OS::TripleO::Services::OpenStackClients: OS::Heat::None OS::TripleO::Services::OpenDaylightApi: OS::Heat::None OS::TripleO::Services::OpenDaylightOvs: OS::Heat::None - OS::TripleO::Services::SensuClient: OS::Heat::None OS::TripleO::Services::TLSProxyBase: OS::Heat::None OS::TripleO::Services::Zaqar: OS::Heat::None OS::TripleO::Services::NeutronML2FujitsuCfab: OS::Heat::None diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 492136fecf..dc842dd79d 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -560,7 +560,6 @@ resources: role_extraconfig: map_merge: - tripleo::profile::base::metrics::collectd::sensubility::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]} - - sensu::subscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]} {%- if role.deprecated_param_extraconfig is defined %} - {get_param: {{role.deprecated_param_extraconfig}}} {%- endif %} diff --git a/roles/BlockStorage.yaml b/roles/BlockStorage.yaml index e05a0d8d33..fb54fb7d58 100644 --- a/roles/BlockStorage.yaml +++ b/roles/BlockStorage.yaml @@ -38,7 +38,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/roles/CellController.yaml b/roles/CellController.yaml index d9421add23..1e20d97e9e 100644 --- a/roles/CellController.yaml +++ b/roles/CellController.yaml @@ -53,7 +53,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/CephAll.yaml b/roles/CephAll.yaml index 22b6b316aa..2d73e47e80 100644 --- a/roles/CephAll.yaml +++ b/roles/CephAll.yaml @@ -39,7 +39,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml index 6fa5bf7ddc..ef8db8b820 100644 --- a/roles/CephFile.yaml +++ b/roles/CephFile.yaml @@ -35,7 +35,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml index 60759a75d0..332fdde9c7 100644 --- a/roles/CephObject.yaml +++ b/roles/CephObject.yaml @@ -35,7 +35,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml index 56b4e7438e..b4411229f1 100644 --- a/roles/CephStorage.yaml +++ b/roles/CephStorage.yaml @@ -34,7 +34,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/roles/Compute.yaml b/roles/Compute.yaml index aa81d1c36e..03c232c5d7 100644 --- a/roles/Compute.yaml +++ b/roles/Compute.yaml @@ -68,7 +68,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeAlt.yaml b/roles/ComputeAlt.yaml index 1ea000b2ef..b4d48dafe9 100644 --- a/roles/ComputeAlt.yaml +++ b/roles/ComputeAlt.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClientAlt - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeDVR.yaml b/roles/ComputeDVR.yaml index e2c67ea797..0e3ce067de 100644 --- a/roles/ComputeDVR.yaml +++ b/roles/ComputeDVR.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeHCI.yaml b/roles/ComputeHCI.yaml index bc0291d119..eb997ac817 100644 --- a/roles/ComputeHCI.yaml +++ b/roles/ComputeHCI.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeHCIOvsDpdk.yaml b/roles/ComputeHCIOvsDpdk.yaml index 0917ecc84a..1196e1f62e 100644 --- a/roles/ComputeHCIOvsDpdk.yaml +++ b/roles/ComputeHCIOvsDpdk.yaml @@ -56,7 +56,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeInstanceHA.yaml b/roles/ComputeInstanceHA.yaml index 9f629164ad..f67757be9f 100644 --- a/roles/ComputeInstanceHA.yaml +++ b/roles/ComputeInstanceHA.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeLiquidio.yaml b/roles/ComputeLiquidio.yaml index e0aba14557..ae52002d4e 100644 --- a/roles/ComputeLiquidio.yaml +++ b/roles/ComputeLiquidio.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeLocalEphemeral.yaml b/roles/ComputeLocalEphemeral.yaml index 92defe8cd6..bc3f5e6621 100644 --- a/roles/ComputeLocalEphemeral.yaml +++ b/roles/ComputeLocalEphemeral.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeOvsDpdk.yaml b/roles/ComputeOvsDpdk.yaml index 17f6471e12..747dc82f08 100644 --- a/roles/ComputeOvsDpdk.yaml +++ b/roles/ComputeOvsDpdk.yaml @@ -56,7 +56,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeOvsDpdkRT.yaml b/roles/ComputeOvsDpdkRT.yaml index 6e8fc5b322..c9d2f7f9b7 100644 --- a/roles/ComputeOvsDpdkRT.yaml +++ b/roles/ComputeOvsDpdkRT.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeOvsDpdkSriov.yaml b/roles/ComputeOvsDpdkSriov.yaml index e8e5788057..dea2f4a85f 100644 --- a/roles/ComputeOvsDpdkSriov.yaml +++ b/roles/ComputeOvsDpdkSriov.yaml @@ -53,7 +53,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeOvsDpdkSriovRT.yaml b/roles/ComputeOvsDpdkSriovRT.yaml index 9eb1498860..c51c4a0eb9 100644 --- a/roles/ComputeOvsDpdkSriovRT.yaml +++ b/roles/ComputeOvsDpdkSriovRT.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputePPC64LE.yaml b/roles/ComputePPC64LE.yaml index b0f8dc47aa..7276e2cf90 100644 --- a/roles/ComputePPC64LE.yaml +++ b/roles/ComputePPC64LE.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeRBDEphemeral.yaml b/roles/ComputeRBDEphemeral.yaml index 9c4e00d478..a29fafb50a 100644 --- a/roles/ComputeRBDEphemeral.yaml +++ b/roles/ComputeRBDEphemeral.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeRealTime.yaml b/roles/ComputeRealTime.yaml index 41b3ef67cd..0cc8601fac 100644 --- a/roles/ComputeRealTime.yaml +++ b/roles/ComputeRealTime.yaml @@ -61,7 +61,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeSriov.yaml b/roles/ComputeSriov.yaml index 87dc74a3a1..9ff98944f1 100644 --- a/roles/ComputeSriov.yaml +++ b/roles/ComputeSriov.yaml @@ -53,7 +53,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ComputeSriovRT.yaml b/roles/ComputeSriovRT.yaml index 06617e0abf..337cc39496 100644 --- a/roles/ComputeSriovRT.yaml +++ b/roles/ComputeSriovRT.yaml @@ -55,7 +55,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/Controller.yaml b/roles/Controller.yaml index a55a9f7388..1815ddbdbd 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -168,7 +168,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index f0f3466dd4..d9b9a2aa93 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -118,7 +118,6 @@ - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index 3481e3109d..9bb722b800 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -160,7 +160,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 111d7dc13e..2a18842778 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -136,7 +136,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 27a8fe3e71..67b7ae0101 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -132,7 +132,6 @@ - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index be42de9be3..781949ca3c 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -170,7 +170,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 83be2d5f3b..6a1431dea5 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -169,7 +169,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/Database.yaml b/roles/Database.yaml index bcaed05320..0e2a7cb6b6 100644 --- a/roles/Database.yaml +++ b/roles/Database.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml index 5076f169ad..8defd15bda 100644 --- a/roles/DistributedCompute.yaml +++ b/roles/DistributedCompute.yaml @@ -54,7 +54,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml index aa31d725e6..56bdc9f179 100644 --- a/roles/DistributedComputeHCI.yaml +++ b/roles/DistributedComputeHCI.yaml @@ -62,7 +62,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/HciCephAll.yaml b/roles/HciCephAll.yaml index c2f76a0e14..a2b1f6adb3 100644 --- a/roles/HciCephAll.yaml +++ b/roles/HciCephAll.yaml @@ -62,7 +62,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/HciCephFile.yaml b/roles/HciCephFile.yaml index 96d26cb0dd..f3598b0caf 100644 --- a/roles/HciCephFile.yaml +++ b/roles/HciCephFile.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/HciCephMon.yaml b/roles/HciCephMon.yaml index 04164432a6..cbc5778a59 100644 --- a/roles/HciCephMon.yaml +++ b/roles/HciCephMon.yaml @@ -58,7 +58,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/HciCephObject.yaml b/roles/HciCephObject.yaml index e2048f3ac8..d7323b8775 100644 --- a/roles/HciCephObject.yaml +++ b/roles/HciCephObject.yaml @@ -57,7 +57,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/IronicConductor.yaml b/roles/IronicConductor.yaml index 976b0b7d46..04d4308159 100644 --- a/roles/IronicConductor.yaml +++ b/roles/IronicConductor.yaml @@ -31,7 +31,6 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone diff --git a/roles/Messaging.yaml b/roles/Messaging.yaml index bc47f56822..23aaa761f6 100644 --- a/roles/Messaging.yaml +++ b/roles/Messaging.yaml @@ -29,7 +29,6 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Timesync - OS::TripleO::Services::Timezone diff --git a/roles/Networker.yaml b/roles/Networker.yaml index 18053050c6..4a83d33b23 100644 --- a/roles/Networker.yaml +++ b/roles/Networker.yaml @@ -42,7 +42,6 @@ - OS::TripleO::Services::Podman - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/Novacontrol.yaml b/roles/Novacontrol.yaml index e63050250b..0d6cf83a15 100644 --- a/roles/Novacontrol.yaml +++ b/roles/Novacontrol.yaml @@ -37,7 +37,6 @@ - OS::TripleO::Services::Rhsm - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd diff --git a/roles/ObjectStorage.yaml b/roles/ObjectStorage.yaml index 89b75a7143..560137f73f 100644 --- a/roles/ObjectStorage.yaml +++ b/roles/ObjectStorage.yaml @@ -42,7 +42,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::SwiftRingBuilder diff --git a/roles/README.rst b/roles/README.rst index daeeecce66..36bfc1fc7e 100644 --- a/roles/README.rst +++ b/roles/README.rst @@ -173,7 +173,6 @@ Example * OS::TripleO::Services::OpenDaylightOvs * OS::TripleO::Services::Podman * OS::TripleO::Services::Securetty - * OS::TripleO::Services::SensuClient * OS::TripleO::Services::Snmp * OS::TripleO::Services::Sshd * OS::TripleO::Services::Timesync diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 4f94d9a693..a7781e9301 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -168,7 +168,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp diff --git a/roles/Telemetry.yaml b/roles/Telemetry.yaml index bd72b63a8e..b34990e18d 100644 --- a/roles/Telemetry.yaml +++ b/roles/Telemetry.yaml @@ -44,7 +44,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/roles_data.yaml b/roles_data.yaml index e82c225301..46b02afa00 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -171,7 +171,6 @@ - OS::TripleO::Services::SaharaApi - OS::TripleO::Services::SaharaEngine - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::SkydiveAnalyzer - OS::TripleO::Services::Snmp @@ -258,7 +257,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::SkydiveAgent - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd @@ -310,7 +308,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync @@ -362,7 +359,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::SwiftRingBuilder @@ -409,7 +405,6 @@ - OS::TripleO::Services::Rsyslog - OS::TripleO::Services::RsyslogSidecar - OS::TripleO::Services::Securetty - - OS::TripleO::Services::SensuClient - OS::TripleO::Services::Snmp - OS::TripleO::Services::Sshd - OS::TripleO::Services::Timesync diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 6139d1a7b7..09cdab0a7b 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -243,7 +243,6 @@ environments: OS::TripleO::Services::SaharaEngine: OS::Heat::None OS::TripleO::Services::Securetty: OS::Heat::None OS::TripleO::Services::SELinux: OS::Heat::None - OS::TripleO::Services::SensuClient: OS::Heat::None OS::TripleO::Services::SkydiveAgent: OS::Heat::None OS::TripleO::Services::SkydiveAnalyzer: OS::Heat::None OS::TripleO::Services::Snmp: OS::Heat::None