Ceilometer Compute Agent composable service
Implement the service for ceilometer agent compute. Change-Id: I5ab3887832588ce26e2d258d05f725d87d2c103d
This commit is contained in:
parent
f12f7f33dd
commit
856a990b47
|
@ -184,6 +184,7 @@ resource_registry:
|
|||
OS::TripleO::Services::CeilometerExpirer: puppet/services/ceilometer-expirer.yaml
|
||||
OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml
|
||||
OS::TripleO::Services::CeilometerAgentNotification: puppet/services/ceilometer-agent-notification.yaml
|
||||
OS::TripleO::Services::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml
|
||||
OS::TripleO::Services::Horizon: puppet/services/horizon.yaml
|
||||
#Gnocchi services
|
||||
OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml
|
||||
|
|
|
@ -271,12 +271,6 @@ parameters:
|
|||
description: How many replicas to use in the swift rings.
|
||||
|
||||
# Compute-specific params
|
||||
CeilometerComputeAgent:
|
||||
description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
|
||||
type: string
|
||||
default: ''
|
||||
constraints:
|
||||
- allowed_values: ['', Present]
|
||||
ComputeCount:
|
||||
type: number
|
||||
default: 1
|
||||
|
@ -436,6 +430,7 @@ parameters:
|
|||
- OS::TripleO::Services::Kernel
|
||||
- OS::TripleO::Services::ComputeNeutronCorePlugin
|
||||
- OS::TripleO::Services::ComputeNeutronOvsAgent
|
||||
- OS::TripleO::Services::ComputeCeilometerAgent
|
||||
description: A list of service resources (configured in the Heat
|
||||
resource_registry) which represent nested stacks
|
||||
for each service that should get installed on the Compute Nodes.
|
||||
|
@ -754,7 +749,6 @@ resources:
|
|||
type: OS::TripleO::Compute
|
||||
properties:
|
||||
AdminPassword: {get_param: AdminPassword}
|
||||
CeilometerComputeAgent: {get_param: CeilometerComputeAgent}
|
||||
CinderEnableNfsBackend: {get_param: CinderEnableNfsBackend}
|
||||
CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
|
||||
Debug: {get_param: Debug}
|
||||
|
|
|
@ -434,7 +434,6 @@ resources:
|
|||
ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret}
|
||||
ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
|
||||
ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url}
|
||||
ceilometer_compute_agent: {get_input: ceilometer_compute_agent}
|
||||
nova::glance_api_servers: {get_input: glance_api_servers}
|
||||
neutron::debug: {get_input: debug}
|
||||
neutron::rabbit_password: {get_input: rabbit_password}
|
||||
|
@ -486,7 +485,6 @@ resources:
|
|||
upgrade_level_nova_compute: {get_param: UpgradeLevelNovaCompute}
|
||||
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
|
||||
ceilometer_password: {get_param: CeilometerPassword}
|
||||
ceilometer_compute_agent: {get_param: CeilometerComputeAgent}
|
||||
ceilometer_agent_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
||||
glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
|
||||
neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
|
||||
|
|
|
@ -23,11 +23,6 @@ if hiera('step') >= 4 {
|
|||
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
|
||||
}
|
||||
|
||||
include ::ceilometer
|
||||
include ::ceilometer::config
|
||||
include ::ceilometer::agent::compute
|
||||
include ::ceilometer::agent::auth
|
||||
|
||||
hiera_include('compute_classes')
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,26 @@
|
|||
heat_template_version: 2016-04-08
|
||||
|
||||
description: >
|
||||
OpenStack Ceilometer Compute Agent service configured with Puppet
|
||||
|
||||
parameters:
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
via parameter_defaults in the resource registry.
|
||||
type: json
|
||||
|
||||
resources:
|
||||
CeilometerServiceBase:
|
||||
type: ./ceilometer-base.yaml
|
||||
properties:
|
||||
EndpointMap: {get_param: EndpointMap}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
description: Role data for the Ceilometer Compute Agent role.
|
||||
value:
|
||||
config_settings:
|
||||
get_attr: [CeilometerServiceBase, role_data, config_settings]
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::ceilometer::agent::compute
|
Loading…
Reference in New Issue