Browse Source

Merge "Disable legacy telemetry by default" into stable/train

changes/54/695654/1
Zuul 2 weeks ago
parent
commit
2772ee92e5
20 changed files with 99 additions and 45 deletions
  1. +1
    -0
      ci/environments/scenario001-multinode-containers.yaml
  2. +1
    -0
      ci/environments/scenario001-standalone.yaml
  3. +1
    -0
      ci/environments/scenario002-multinode-containers.yaml
  4. +1
    -0
      ci/environments/scenario002-standalone.yaml
  5. +1
    -0
      ci/environments/scenario004-multinode-containers.yaml
  6. +1
    -0
      ci/environments/scenario004-standalone.yaml
  7. +1
    -0
      ci/environments/scenario010-multinode-containers.yaml
  8. +30
    -19
      deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
  9. +2
    -2
      deployment/ceilometer/ceilometer-base-container-puppet.yaml
  10. +26
    -0
      deployment/deprecated/telemetry/enable-legacy-telemetry.yaml
  11. +4
    -2
      environments/ceph-ansible/ceph-ansible-external.yaml
  12. +2
    -1
      environments/ceph-ansible/ceph-ansible-per-role.yaml
  13. +2
    -1
      environments/ceph-ansible/ceph-ansible.yaml
  14. +3
    -2
      environments/computealt.yaml
  15. +1
    -0
      environments/disable-telemetry.yaml
  16. +1
    -0
      environments/services-baremetal/undercloud-ceilometer.yaml
  17. +3
    -3
      environments/services-baremetal/undercloud-gnocchi.yaml
  18. +4
    -2
      environments/storage-environment-external.yaml
  19. +2
    -1
      environments/storage-environment.yaml
  20. +12
    -12
      overcloud-resource-registry-puppet.j2.yaml

+ 1
- 0
ci/environments/scenario001-multinode-containers.yaml View File

@@ -103,6 +103,7 @@ parameter_defaults:
ceilometer::agent::polling::polling_interval: 15
ManagePolling: true
ManagePipeline: true
CeilometerEnableGnocchi: true
PipelinePublishers:
- gnocchi://?archive_policy=ceilometer-high-rate
EventPipelinePublishers:

+ 1
- 0
ci/environments/scenario001-standalone.yaml View File

@@ -47,6 +47,7 @@ parameter_defaults:
ManagePolling: true
HeatConfigureDelegatedRoles: true
ManagePipeline: true
CeilometerEnableGnocchi: true
PipelinePublishers:
- gnocchi://?archive_policy=ceilometer-high-rate
EventPipelinePublishers:

+ 1
- 0
ci/environments/scenario002-multinode-containers.yaml View File

@@ -96,6 +96,7 @@ parameter_defaults:
ceilometer::agent::polling::polling_interval: 15
ManagePolling: true
ManagePipeline: true
CeilometerEnableGnocchi: true
PipelinePublishers:
- gnocchi://?archive_policy=ceilometer-high-rate
EventPipelinePublishers:

+ 1
- 0
ci/environments/scenario002-standalone.yaml View File

@@ -37,6 +37,7 @@ parameter_defaults:
ceilometer::agent::polling::polling_interval: 15
ManagePolling: true
ManagePipeline: true
CeilometerEnableGnocchi: true
PipelinePublishers:
- gnocchi://?archive_policy=ceilometer-high-rate
EventPipelinePublishers:

+ 1
- 0
ci/environments/scenario004-multinode-containers.yaml View File

@@ -123,6 +123,7 @@ parameter_defaults:
NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
CinderBackupBackend: ceph
CeilometerEnableGnocchi: true
GlanceBackend: rbd
GnocchiBackend: rbd
CinderEnableIscsiBackend: false

+ 1
- 0
ci/environments/scenario004-standalone.yaml View File

@@ -71,6 +71,7 @@ parameter_defaults:
ManilaCephFSMetadataPoolPGNum: 16
NovaEnableRbdBackend: true
GlanceBackend: rbd
CeilometerEnableGnocchi: true
GnocchiBackend: rbd
GnocchiArchivePolicy: 'high'
BannerText: |

+ 1
- 0
ci/environments/scenario010-multinode-containers.yaml View File

@@ -112,6 +112,7 @@ parameter_defaults:
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
NovaEnableRbdBackend: true
CeilometerEnableGnocchi: true
GlanceBackend: rbd
GnocchiRbdPoolName: metrics
SwiftCeilometerPipelineEnabled: false

+ 30
- 19
deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml View File

@@ -48,6 +48,13 @@ parameters:
MonitoringSubscriptionCeilometerCentral:
default: 'overcloud-ceilometer-agent-central'
type: string
CeilometerEnableGnocchi:
default: false
description: Whether to enable gnocchi usage.
type: boolean

conditions:
ceilometer_enable_gnocchi: {equals: [{get_param: CeilometerEnableGnocchi}, True]}

resources:

@@ -124,25 +131,29 @@ outputs:
environment:
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
step_5:
ceilometer_gnocchi_upgrade:
start_order: 99
image: *ceilometer_agent_central_image
net: host
detach: false
privileged: false
user: root
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
- /var/log/containers/ceilometer:/var/log/ceilometer:z
command:
- '/usr/bin/bootstrap_host_exec'
- 'ceilometer_agent_central'
- "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade && exit 0 || sleep 30; done; exit 1'"
map_merge:
- if:
- ceilometer_enable_gnocchi
- ceilometer_gnocchi_upgrade:
start_order: 99
image: *ceilometer_agent_central_image
net: host
detach: false
privileged: false
user: root
healthcheck:
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/ceilometer/etc/ceilometer/:/etc/ceilometer/:ro
- /var/log/containers/ceilometer:/var/log/ceilometer:z
command:
- '/usr/bin/bootstrap_host_exec'
- 'ceilometer_agent_central'
- "su ceilometer -s /bin/bash -c 'for n in {1..10}; do /usr/bin/ceilometer-upgrade && exit 0 || sleep 30; done; exit 1'"
- {}
host_prep_tasks:
- name: create persistent directories
file:

+ 2
- 2
deployment/ceilometer/ceilometer-base-container-puppet.yaml View File

@@ -57,7 +57,7 @@ parameters:
description: Whether to manage event_pipeline.yaml.
type: boolean
EventPipelinePublishers:
default: ['gnocchi://?filter_project=service&archive_policy=low']
default: []
description: >
A list of publishers to put in event_pipeline.yaml. When the
collector is used, override this with notifier:// publisher.
@@ -70,7 +70,7 @@ parameters:
description: Whether to manage pipeline.yaml.
type: boolean
PipelinePublishers:
default: ['gnocchi://?filter_project=service&archive_policy=low']
default: []
description: >
A list of publishers to put in pipeline.yaml. When the
collector is used, override this with notifier:// publisher.

+ 26
- 0
deployment/deprecated/telemetry/enable-legacy-telemetry.yaml View File

@@ -0,0 +1,26 @@
# This heat environment can be used to enable legacy telemetry services,
# gnocchi and aodh.

resource_registry:
OS::TripleO::Services::GnocchiApi: ../deployment/gnocchi/gnocchi-api-container-puppet.yaml
OS::TripleO::Services::GnocchiMetricd: ../deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
OS::TripleO::Services::GnocchiStatsd: ../deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
OS::TripleO::Services::AodhApi: ../deployment/aodh/aodh-api-container-puppet.yaml
OS::TripleO::Services::AodhEvaluator: ../deployment/aodh/aodh-evaluator-container-puppet.yaml
OS::TripleO::Services::AodhNotifier: ../deployment/aodh/aodh-notifier-container-puppet.yaml
OS::TripleO::Services::AodhListener: ../deployment/aodh/aodh-listener-container-puppet.yaml
OS::TripleO::Services::Redis: ../deployment/database/redis-pacemaker-puppet.yaml
OS::TripleO::Services::CeilometerAgentCentral: ../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentNotification: ../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgent: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml

parameter_defaults:
GnocchiRbdPoolName: 'metrics'
GnocchiBackend: 'rbd'
GnocchiArchivePolicy: 'high'
CeilometerEnableGnocchi: true
ManagePipeline: true
EventPipelinePublishers:
- gnocchi://?archive_policy=high
PipelinePublishers:
- gnocchi://?archive_policy=high

+ 4
- 2
environments/ceph-ansible/ceph-ansible-external.yaml View File

@@ -12,7 +12,8 @@ parameter_defaults:
CinderEnableRbdBackend: true
CinderBackupBackend: ceph
GlanceBackend: rbd
GnocchiBackend: rbd
# Uncomment below if enabling legacy telemetry
# GnocchiBackend: rbd
# If the Ceph pools which host VMs, Volumes and Images do not match these
# names OR the client keyring to use is not named 'openstack', edit the
# following as needed.
@@ -20,7 +21,8 @@ parameter_defaults:
CinderRbdPoolName: volumes
CinderBackupRbdPoolName: backups
GlanceRbdPoolName: images
GnocchiRbdPoolName: metrics
# Uncomment below if enabling legacy telemetry
# GnocchiRbdPoolName: metrics
CephClientUserName: openstack

# finally we disable the Cinder LVM backend

+ 2
- 1
environments/ceph-ansible/ceph-ansible-per-role.yaml View File

@@ -13,6 +13,7 @@ parameter_defaults:
CinderEnableRbdBackend: true
CinderBackupBackend: ceph
GlanceBackend: rbd
GnocchiBackend: rbd
## Uncomment below if enabling legacy telemetry
# GnocchiBackend: rbd
GlanceShowMultipleLocations: true
# NovaEnableRbdBackend can be set on individual roles to choose RBD or local ephemeral storage

+ 2
- 1
environments/ceph-ansible/ceph-ansible.yaml View File

@@ -14,4 +14,5 @@ parameter_defaults:
CinderBackupBackend: ceph
NovaEnableRbdBackend: true
GlanceBackend: rbd
GnocchiBackend: rbd
## Uncomment below if enabling legacy telemetry
# GnocchiBackend: rbd

+ 3
- 2
environments/computealt.yaml View File

@@ -1,8 +1,9 @@
resource_registry:
OS::TripleO::Services::CollectdAlt: OS::Heat::None
# If enabling collectd you'll need provide the following in a specific resource_registry
# If enabling collectd you'll need to provide the following in a specific resource_registry
# OS::TripleO::Services::CollectdAlt: ../deployment/metrics/collectd-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgentAlt: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
# If enabling legacy telemetry, you'll need to provide the following in a specific resource_registry
# OS::TripleO::Services::ComputeCeilometerAgentAlt: ../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
OS::TripleO::Services::ComputeNeutronOvsAgentAlt: ../deployment/neutron/neutron-ovs-agent-container-puppet.yaml
OS::TripleO::Services::IscsidAlt: ../deployment/iscsid/iscsid-container-puppet.yaml
OS::TripleO::Services::NovaComputeAlt: ../deployment/nova/nova-compute-container-puppet.yaml

+ 1
- 0
environments/disable-telemetry.yaml View File

@@ -14,6 +14,7 @@ resource_registry:
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
OS::TripleO::Services::AodhNotifier: OS::Heat::None
OS::TripleO::Services::AodhListener: OS::Heat::None
OS::TripleO::Services::Redis: OS::Heat::None

parameter_defaults:
NotificationDriver: 'noop'

+ 1
- 0
environments/services-baremetal/undercloud-ceilometer.yaml View File

@@ -1,4 +1,5 @@
resource_registry:
OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml
OS::TripleO::Services::UndercloudCeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::UndercloudCeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::UndercloudCeilometerAgentIpmi: ../../deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

+ 3
- 3
environments/services-baremetal/undercloud-gnocchi.yaml View File

@@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Services::UndercloudGnocchiApi: ../../deployment/gnocchi/gnocchi-api-container-puppet.yaml
OS::TripleO::Services::UndercloudGnocchiMetricd: ../../deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
OS::TripleO::Services::UndercloudGnocchiStatsd: ../../deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
OS::TripleO::Services::UndercloudGnocchiApi: OS::Heat::None
OS::TripleO::Services::UndercloudGnocchiMetricd: OS::Heat::None
OS::TripleO::Services::UndercloudGnocchiStatsd: OS::Heat::None
OS::TripleO::Services::UndercloudRedis: ../../deployment/database/redis-container-puppet.yaml

+ 4
- 2
environments/storage-environment-external.yaml View File

@@ -20,7 +20,8 @@ parameter_defaults:
CinderEnableRbdBackend: true
CinderBackupBackend: ceph
GlanceBackend: rbd
GnocchiBackend: rbd
## Uncomment below if enabling legacy telemetry
# GnocchiBackend: rbd
# If the Ceph pools which host VMs, Volumes and Images do not match these
# names OR the client keyring to use is not named 'openstack', edit the
# following as needed.
@@ -28,8 +29,9 @@ parameter_defaults:
CinderRbdPoolName: volumes
CinderBackupRbdPoolName: backups
GlanceRbdPoolName: images
GnocchiRbdPoolName: metrics
CephClientUserName: openstack
## Uncomment below if enabling legacy telemetry
# GnocchiRbdPoolName: metrics

# finally we disable the Cinder LVM backend
CinderEnableIscsiBackend: false

+ 2
- 1
environments/storage-environment.yaml View File

@@ -27,7 +27,8 @@ parameter_defaults:
## Glance backend can be either 'rbd' (Ceph), 'swift' or 'file'.
GlanceBackend: rbd
## Gnocchi backend can be either 'rbd' (Ceph), 'swift' or 'file'.
GnocchiBackend: rbd
## Uncomment below if enabling legacy telemetry
# GnocchiBackend: rbd


#### CINDER NFS SETTINGS ####

+ 12
- 12
overcloud-resource-registry-puppet.j2.yaml View File

@@ -191,7 +191,7 @@ resource_registry:
# TODO(aschultz): Remove this in U as we switched to a task in the deploy
OS::TripleO::Services::SELinux: OS::Heat::None
OS::TripleO::Services::Sshd: deployment/sshd/sshd-baremetal-puppet.yaml
OS::TripleO::Services::Redis: deployment/database/redis-container-puppet.yaml
OS::TripleO::Services::Redis: OS::Heat::None
OS::TripleO::Services::NovaApi: deployment/nova/nova-api-container-puppet.yaml
OS::TripleO::Services::NovaCompute: deployment/nova/nova-compute-container-puppet.yaml
OS::TripleO::Services::NovaConductor: deployment/nova/nova-conductor-container-puppet.yaml
@@ -217,15 +217,15 @@ resource_registry:
OS::TripleO::Services::SwiftRingBuilder: deployment/swift/swift-ringbuilder-container-puppet.yaml
OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-ansible.yaml
OS::TripleO::Services::CeilometerAgentCentral: deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentIpmi: deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentNotification: deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgent: deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentCentral: OS::Heat::None
OS::TripleO::Services::CeilometerAgentIpmi: OS::Heat::None
OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
OS::TripleO::Services::Horizon: deployment/horizon/horizon-container-puppet.yaml
#Gnocchi services
OS::TripleO::Services::GnocchiApi: deployment/gnocchi/gnocchi-api-container-puppet.yaml
OS::TripleO::Services::GnocchiMetricd: deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
OS::TripleO::Services::GnocchiStatsd: deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
OS::TripleO::Services::GnocchiApi: OS::Heat::None
OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
OS::TripleO::Services::GnocchiStatsd: OS::Heat::None
# Drop Xinetd
OS::TripleO::Services::Xinetd: OS::Heat::None

@@ -259,10 +259,10 @@ resource_registry:
OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None
OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None
OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None
OS::TripleO::Services::AodhApi: deployment/aodh/aodh-api-container-puppet.yaml
OS::TripleO::Services::AodhEvaluator: deployment/aodh/aodh-evaluator-container-puppet.yaml
OS::TripleO::Services::AodhListener: deployment/aodh/aodh-listener-container-puppet.yaml
OS::TripleO::Services::AodhNotifier: deployment/aodh/aodh-notifier-container-puppet.yaml
OS::TripleO::Services::AodhApi: OS::Heat::None
OS::TripleO::Services::AodhEvaluator: OS::Heat::None
OS::TripleO::Services::AodhListener: OS::Heat::None
OS::TripleO::Services::AodhNotifier: OS::Heat::None
OS::TripleO::Services::MetricsQdr: OS::Heat::None
OS::TripleO::Services::MistralEngine: OS::Heat::None
OS::TripleO::Services::MistralApi: OS::Heat::None

Loading…
Cancel
Save