Browse Source
Ceilometer API, Collector and Expirer are removed from upstream, so lets clean these deprecated services. Change-Id: Ifd28a3029cd39644833ab0e9fc66efb7b5b67c9dchanges/45/509645/6
Pradeep Kilambi
5 years ago
18 changed files with 6 additions and 505 deletions
@ -1,6 +0,0 @@
|
||||
resource_registry: |
||||
OS::TripleO::Services::CeilometerApi: ../../puppet/services/ceilometer-api.yaml |
||||
|
||||
parameter_defaults: |
||||
CeilometerApiEndpoint: true |
||||
|
||||
@ -1,3 +0,0 @@
|
||||
resource_registry: |
||||
OS::TripleO::Services::CeilometerCollector: ../../puppet/services/ceilometer-collector.yaml |
||||
OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml |
||||
@ -1,2 +0,0 @@
|
||||
resource_registry: |
||||
OS::TripleO::Services::CeilometerExpirer: ../../puppet/services/ceilometer-expirer.yaml |
||||
@ -1,126 +0,0 @@
|
||||
heat_template_version: pike |
||||
|
||||
description: > |
||||
OpenStack Ceilometer API service configured with Puppet |
||||
|
||||
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 |
||||
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 |
||||
EndpointMap: |
||||
default: {} |
||||
description: Mapping of service endpoint -> protocol. Typically set |
||||
via parameter_defaults in the resource registry. |
||||
type: json |
||||
MonitoringSubscriptionCeilometerApi: |
||||
default: 'overcloud-ceilometer-api' |
||||
type: string |
||||
CeilometerApiLoggingSource: |
||||
type: json |
||||
default: |
||||
tag: openstack.ceilometer.api |
||||
path: /var/log/ceilometer/api.log |
||||
EnableInternalTLS: |
||||
type: boolean |
||||
default: false |
||||
CeilometerApiPolicies: |
||||
description: | |
||||
A hash of policies to configure for Ceilometer API. |
||||
e.g. { ceilometer-context_is_admin: { key: context_is_admin, value: 'role:admin' } } |
||||
default: {} |
||||
type: json |
||||
|
||||
resources: |
||||
CeilometerServiceBase: |
||||
type: ./ceilometer-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} |
||||
|
||||
ApacheServiceBase: |
||||
type: ./apache.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} |
||||
EnableInternalTLS: {get_param: EnableInternalTLS} |
||||
|
||||
outputs: |
||||
role_data: |
||||
description: Role data for the Ceilometer API role. |
||||
value: |
||||
service_name: ceilometer_api |
||||
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerApi} |
||||
logging_source: {get_param: CeilometerApiLoggingSource} |
||||
logging_groups: |
||||
- ceilometer |
||||
config_settings: |
||||
map_merge: |
||||
- get_attr: [ApacheServiceBase, role_data, config_settings] |
||||
- get_attr: [CeilometerServiceBase, role_data, config_settings] |
||||
- tripleo.ceilometer_api.firewall_rules: |
||||
'124 ceilometer': |
||||
dport: |
||||
- 8777 |
||||
- 13777 |
||||
# NOTE: bind IP is found in Heat replacing the network name with the |
||||
# local node IP for the given network; replacement examples |
||||
# (eg. for internal_api): |
||||
# internal_api -> IP |
||||
# internal_api_uri -> [IP] |
||||
# internal_api_subnet - > IP/CIDR |
||||
- ceilometer::api::service_name: 'httpd' |
||||
ceilometer::api::enable_proxy_headers_parsing: true |
||||
ceilometer::api::host: |
||||
str_replace: |
||||
template: |
||||
"%{hiera('fqdn_$NETWORK')}" |
||||
params: |
||||
$NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} |
||||
ceilometer::policy::policies: {get_param: CeilometerApiPolicies} |
||||
ceilometer::wsgi::apache::bind_host: {get_param: [ServiceNetMap, CeilometerApiNetwork]} |
||||
ceilometer::wsgi::apache::ssl: {get_param: EnableInternalTLS} |
||||
ceilometer::wsgi::apache::servername: |
||||
str_replace: |
||||
template: |
||||
"%{hiera('fqdn_$NETWORK')}" |
||||
params: |
||||
$NETWORK: {get_param: [ServiceNetMap, CeilometerApiNetwork]} |
||||
service_config_settings: |
||||
get_attr: [CeilometerServiceBase, role_data, service_config_settings] |
||||
step_config: | |
||||
include ::tripleo::profile::base::ceilometer::api |
||||
metadata_settings: |
||||
get_attr: [ApacheServiceBase, role_data, metadata_settings] |
||||
upgrade_tasks: |
||||
list_concat: |
||||
- get_attr: [ApacheServiceBase, role_data, upgrade_tasks] |
||||
- |
||||
- name: Stop ceilometer_api service (running under httpd) |
||||
tags: step1 |
||||
service: name=httpd state=stopped |
||||
@ -1,146 +0,0 @@
|
||||
heat_template_version: pike |
||||
|
||||
description: > |
||||
OpenStack Ceilometer Collector service configured with Puppet |
||||
This service is deprecated and will be removed in future releases. |
||||
|
||||
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 |
||||
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 |
||||
EndpointMap: |
||||
default: {} |
||||
description: Mapping of service endpoint -> protocol. Typically set |
||||
via parameter_defaults in the resource registry. |
||||
type: json |
||||
CeilometerBackend: |
||||
default: 'mongodb' |
||||
description: The ceilometer backend type. |
||||
type: string |
||||
CeilometerPassword: |
||||
description: The password for the ceilometer service account. |
||||
type: string |
||||
hidden: true |
||||
MonitoringSubscriptionCeilometerCollector: |
||||
default: 'overcloud-ceilometer-collector' |
||||
type: string |
||||
CeilometerCollectorLoggingSource: |
||||
type: json |
||||
default: |
||||
tag: openstack.ceilometer.collector |
||||
path: /var/log/ceilometer/collector.log |
||||
CeilometerMeterDispatcher: |
||||
default: ['gnocchi'] |
||||
description: Comma-seperated list of Dispatcher to process meter data |
||||
Note that database option is deprecated and will not be |
||||
supported in future. |
||||
type: comma_delimited_list |
||||
constraints: |
||||
- allowed_values: ['gnocchi', 'database'] |
||||
CeilometerEventDispatcher: |
||||
default: ['panko', 'gnocchi'] |
||||
description: Comma-separated list of Dispatchers to process events data |
||||
Note that database option is deprecated and will not be |
||||
supported in future. |
||||
type: comma_delimited_list |
||||
constraints: |
||||
- allowed_values: ['panko', 'gnocchi', 'database'] |
||||
CeilometerEventTTL: |
||||
default: '86400' |
||||
description: Number of seconds that events are kept in the database for |
||||
(<= 0 means forever) |
||||
type: string |
||||
CeilometerMeteringTTL: |
||||
default: '86400' |
||||
description: Number of seconds that samples are kept in the database for |
||||
(<= 0 means forever) |
||||
type: string |
||||
resources: |
||||
CeilometerServiceBase: |
||||
type: ./ceilometer-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} |
||||
|
||||
MongoDbBase: |
||||
type: ./database/mongodb-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 Ceilometer Collector role. |
||||
value: |
||||
service_name: ceilometer_collector |
||||
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCollector} |
||||
logging_source: {get_param: CeilometerCollectorLoggingSource} |
||||
logging_groups: |
||||
- ceilometer |
||||
config_settings: |
||||
map_merge: |
||||
- get_attr: [MongoDbBase, role_data, config_settings] |
||||
- get_attr: [CeilometerServiceBase, role_data, config_settings] |
||||
- ceilometer::db::database_connection: |
||||
make_url: |
||||
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} |
||||
username: ceilometer |
||||
password: {get_param: CeilometerPassword} |
||||
host: {get_param: [EndpointMap, MysqlInternal, host]} |
||||
path: /ceilometer |
||||
query: |
||||
read_default_file: /etc/my.cnf.d/tripleo.cnf |
||||
read_default_group: tripleo |
||||
ceilometer_backend: {get_param: CeilometerBackend} |
||||
ceilometer::event_time_to_live: {get_param: CeilometerEventTTL} |
||||
ceilometer::metering_time_to_live: {get_param: CeilometerMeteringTTL} |
||||
# we include db_sync class in puppet-tripleo |
||||
ceilometer::db::sync_db: false |
||||
ceilometer::db::database_db_max_retries: -1 |
||||
ceilometer::db::database_max_retries: -1 |
||||
ceilometer::collector::meter_dispatcher: {get_param: CeilometerMeterDispatcher} |
||||
ceilometer::collector::event_dispatcher: {get_param: CeilometerEventDispatcher} |
||||
service_config_settings: |
||||
get_attr: [CeilometerServiceBase, role_data, service_config_settings] |
||||
step_config: | |
||||
include ::tripleo::profile::base::ceilometer::collector |
||||
upgrade_tasks: |
||||
- name: Check if ceilometer_collector is deployed |
||||
command: systemctl is-enabled openstack-ceilometer-collector |
||||
tags: common |
||||
ignore_errors: True |
||||
register: ceilometer_collector_enabled |
||||
- name: "PreUpgrade step0,validation: Check service openstack-ceilometer-collector is running" |
||||
shell: /usr/bin/systemctl show 'openstack-ceilometer-collector' --property ActiveState | grep '\bactive\b' |
||||
when: ceilometer_collector_enabled.rc == 0 |
||||
tags: step0,validation |
||||
- name: Stop ceilometer_collector service |
||||
tags: step1 |
||||
when: ceilometer_collector_enabled.rc == 0 |
||||
service: name=openstack-ceilometer-collector state=stopped |
||||
@ -1,59 +0,0 @@
|
||||
heat_template_version: pike |
||||
|
||||
description: > |
||||
OpenStack Ceilometer Expirer service configured with Puppet |
||||
Note, This service is deprecated and will be removed in |
||||
future releases. |
||||
|
||||
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 |
||||
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 |
||||
EndpointMap: |
||||
default: {} |
||||
description: Mapping of service endpoint -> protocol. Typically set |
||||
via parameter_defaults in the resource registry. |
||||
type: json |
||||
MonitoringSubscriptionCeilometerExpirer: |
||||
default: 'overcloud-ceilometer-expirer' |
||||
type: string |
||||
|
||||
resources: |
||||
CeilometerServiceBase: |
||||
type: ./ceilometer-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 Ceilometer Expirer role. |
||||
value: |
||||
service_name: ceilometer_expirer |
||||
monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerExpirer} |
||||
config_settings: |
||||
get_attr: [CeilometerServiceBase, role_data, config_settings] |
||||
step_config: | |
||||
include ::tripleo::profile::base::ceilometer::expirer |
||||
@ -1,45 +0,0 @@
|
||||
heat_template_version: pike |
||||
|
||||
description: > |
||||
OpenStack Ceilometer API service, disabled since pike |
||||
|
||||
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 |
||||
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 |
||||
EndpointMap: |
||||
default: {} |
||||
description: Mapping of service endpoint -> protocol. Typically set |
||||
via parameter_defaults in the resource registry. |
||||
type: json |
||||
|
||||
outputs: |
||||
role_data: |
||||
description: Role data for the disabled Ceilometer API role. |
||||
value: |
||||
service_name: ceilometer_api_disabled |
||||
upgrade_tasks: |
||||
- name: Purge Ceilometer apache config files |
||||
tags: step1 |
||||
file: path=/etc/httpd/conf.d/10-ceilometer_wsgi.conf state=absent |
||||
- name: Clean up ceilometer port from ports.conf |
||||
tags: step1 |
||||
lineinfile: dest=/etc/httpd/conf/ports.conf state=absent regexp="8777$" |
||||
@ -1,42 +0,0 @@
|
||||
heat_template_version: pike |
||||
|
||||
description: > |
||||
OpenStack Ceilometer Collector service, disabled since pike |
||||
|
||||
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 |
||||
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 |
||||
EndpointMap: |
||||
default: {} |
||||
description: Mapping of service endpoint -> protocol. Typically set |
||||
via parameter_defaults in the resource registry. |
||||
type: json |
||||
|
||||
outputs: |
||||
role_data: |
||||
description: Role data for the disabled Ceilometer Collector role. |
||||
value: |
||||
service_name: ceilometer_collector_disabled |
||||
upgrade_tasks: |
||||
- name: Stop and disable ceilometer_collector service on upgrade |
||||
tags: step1 |
||||
service: name=openstack-ceilometer-collector state=stopped enabled=no |
||||
@ -1,45 +0,0 @@
|
||||
heat_template_version: pike |
||||
|
||||
description: > |
||||
OpenStack Ceilometer Expirer service, disabled since pike |
||||
|
||||
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 |
||||
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 |
||||
EndpointMap: |
||||
default: {} |
||||
description: Mapping of service endpoint -> protocol. Typically set |
||||
via parameter_defaults in the resource registry. |
||||
type: json |
||||
|
||||
outputs: |
||||
role_data: |
||||
description: Role data for the disabling Ceilometer Expirer role. |
||||
value: |
||||
service_name: ceilometer_expirer_disabled |
||||
upgrade_tasks: |
||||
- name: Remove ceilometer expirer cron tab on upgrade |
||||
tags: step1 |
||||
shell: '/usr/bin/crontab -u ceilometer -r' |
||||
register: remove_ceilometer_expirer_crontab |
||||
failed_when: remove_ceilometer_expirer_crontab.rc != 0 and remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer" |
||||
changed_when: remove_ceilometer_expirer_crontab.stderr != "no crontab for ceilometer" |
||||
@ -0,0 +1,6 @@
|
||||
--- |
||||
fixes: |
||||
- | |
||||
Remove Ceilometer Collector, Expirer and Api from the roles data and |
||||
templates. Both these services have been deprecated in Pike release |
||||
and targeted for removal in the current Queens release. |
||||
Loading…
Reference in new issue