Added ceilometer-polling upstart jobs
The ceilometer-central-agent and ceilometer-agent-compute services are now completely removed from the liberty release of ceilometer. The new implementation is to use ceilometer-polling and call the respective pollsters by namespace. This patch addes the neccessary upstart configurations for ceilometer-polling and it also removes the deprecated admin_* options from the ceilometer config file. This patch set is also forcing ceilometer to use the Keystone v2.0 API by adding the versioned path uder [service_credentials] in the ceilometer config file. Change-Id: Iba2bb148df4f3ae9d16b44c27ddff0c0d3fd29d3 UpgradeImpact Closes-Bug: #1519423 Closes-Bug: #1519462
This commit is contained in:
parent
b51c300edd
commit
e6976a3ec1
|
@ -59,7 +59,7 @@ ceilometer_collector_program_name: ceilometer-collector
|
|||
ceilometer_compute_program_name: ceilometer-agent-compute
|
||||
ceilometer_api_program_name: ceilometer-api
|
||||
ceilometer_agent_notification_program_name: ceilometer-agent-notification
|
||||
ceilometer_agent_central_program_name: ceilometer-agent-central
|
||||
ceilometer_polling_program_name: ceilometer-polling
|
||||
|
||||
## Service Type and Data
|
||||
ceilometer_service_region: RegionOne
|
||||
|
@ -71,6 +71,8 @@ ceilometer_service_description: "Ceilometer Service"
|
|||
ceilometer_service_user_name: ceilometer
|
||||
ceilometer_service_tenant_name: service
|
||||
ceilometer_service_project_name: service
|
||||
ceilometer_service_project_domain_id: default
|
||||
ceilometer_service_user_domain_id: default
|
||||
ceilometer_service_publicuri: "{{ ceilometer_service_proto }}://{{ external_lb_vip_address }}:{{ ceilometer_service_port }}"
|
||||
ceilometer_service_publicurl: "{{ ceilometer_service_publicuri }}"
|
||||
ceilometer_service_internaluri: "{{ ceilometer_service_proto }}://{{ internal_lb_vip_address }}:{{ ceilometer_service_port }}"
|
||||
|
@ -84,6 +86,9 @@ ceilometer_service_adminurl: "{{ ceilometer_service_adminuri }}"
|
|||
# ceilometer_collector_workers: 1
|
||||
# ceilometer_notification_workers: 1
|
||||
|
||||
## Keystone authentication middleware
|
||||
ceilometer_keystone_auth_plugin: password
|
||||
|
||||
# Common apt packages
|
||||
ceilometer_apt_packages:
|
||||
- rpcbind
|
||||
|
@ -112,8 +117,7 @@ ceilometer_service_names:
|
|||
- "ceilometer-api"
|
||||
- "ceilometer-collector"
|
||||
- "ceilometer-agent-notification"
|
||||
- "ceilometer-agent-central"
|
||||
- "ceilometer-agent-compute"
|
||||
- "ceilometer-polling"
|
||||
|
||||
|
||||
## Tunable overrides
|
||||
|
|
|
@ -26,23 +26,17 @@
|
|||
state: "restarted"
|
||||
pattern: "{{ ceilometer_collector_program_name }}"
|
||||
|
||||
- name: Restart ceilometer compute
|
||||
service:
|
||||
name: "{{ ceilometer_compute_program_name }}"
|
||||
state: "restarted"
|
||||
pattern: "{{ ceilometer_compute_program_name }}"
|
||||
|
||||
- name: Restart ceilometer agent_notification
|
||||
service:
|
||||
name: "{{ ceilometer_agent_notification_program_name }}"
|
||||
state: "restarted"
|
||||
pattern: "{{ ceilometer_agent_notification_program_name }}"
|
||||
|
||||
- name: Restart ceilometer agent_central
|
||||
- name: Restart ceilometer polling
|
||||
service:
|
||||
name: "{{ ceilometer_agent_central_program_name }}"
|
||||
name: "{{ ceilometer_polling_program_name }}"
|
||||
state: "restarted"
|
||||
pattern: "{{ ceilometer_agent_central_program_name }}"
|
||||
pattern: "{{ ceilometer_polling_program_name }}"
|
||||
|
||||
- name: Restart ceilometer services
|
||||
service:
|
||||
|
|
|
@ -35,17 +35,6 @@
|
|||
tags:
|
||||
- ceilometer-agent-notification-init
|
||||
|
||||
- include: ceilometer_upstart_common_init.yml
|
||||
vars:
|
||||
program_name: "{{ ceilometer_agent_central_program_name }}"
|
||||
service_name: "{{ ceilometer_service_name }}"
|
||||
system_user: "{{ ceilometer_system_user_name }}"
|
||||
system_group: "{{ ceilometer_system_group_name }}"
|
||||
service_home: "{{ ceilometer_system_user_home }}"
|
||||
when: inventory_hostname in groups['ceilometer_agent_central']
|
||||
tags:
|
||||
- ceilometer-agent-central
|
||||
|
||||
- include: ceilometer_upstart_common_init.yml
|
||||
vars:
|
||||
program_name: "{{ ceilometer_collector_program_name }}"
|
||||
|
@ -59,11 +48,24 @@
|
|||
|
||||
- include: ceilometer_upstart_common_init.yml
|
||||
vars:
|
||||
program_name: "{{ ceilometer_compute_program_name }}"
|
||||
program_name: "{{ ceilometer_polling_program_name }}"
|
||||
service_name: "{{ ceilometer_service_name }}"
|
||||
system_user: "{{ ceilometer_system_user_name }}"
|
||||
system_group: "{{ ceilometer_system_group_name }}"
|
||||
service_home: "{{ ceilometer_system_user_home }}"
|
||||
program_config_options: "--polling-namespaces central"
|
||||
when: inventory_hostname in groups['ceilometer_agent_central']
|
||||
tags:
|
||||
- ceilometer-polling-agent-central
|
||||
|
||||
- include: ceilometer_upstart_common_init.yml
|
||||
vars:
|
||||
program_name: "{{ ceilometer_polling_program_name }}"
|
||||
service_name: "{{ ceilometer_service_name }}"
|
||||
system_user: "{{ ceilometer_system_user_name }}"
|
||||
system_group: "{{ ceilometer_system_group_name }}"
|
||||
service_home: "{{ ceilometer_system_user_home }}"
|
||||
program_config_options: "--polling-namespaces compute"
|
||||
when: inventory_hostname in groups['ceilometer_agent_compute']
|
||||
tags:
|
||||
- ceilometer-agent-compute-init
|
||||
- ceilometer-polling-agent-compute-init
|
||||
|
|
|
@ -36,13 +36,17 @@ event_connection = {{ ceilometer_connection_string }}
|
|||
alarm_connection = {{ aodh_connection_string }}
|
||||
|
||||
[keystone_authtoken]
|
||||
insecure = {{ keystone_service_internaluri_insecure | bool }}
|
||||
signing_dir = /var/cache/ceilometer
|
||||
identity_uri = {{ keystone_service_adminuri }}
|
||||
auth_uri = {{ keystone_service_internaluri }}
|
||||
auth_url = {{ keystone_service_adminuri }}
|
||||
admin_tenant_name = {{ ceilometer_service_tenant_name }}
|
||||
admin_user = {{ ceilometer_service_user_name }}
|
||||
admin_password = {{ ceilometer_service_password }}
|
||||
auth_plugin = {{ ceilometer_keystone_auth_plugin }}
|
||||
project_domain_id = {{ ceilometer_service_project_domain_id }}
|
||||
user_domain_id = {{ ceilometer_service_user_domain_id }}
|
||||
project_name = {{ ceilometer_service_project_name }}
|
||||
username = {{ ceilometer_service_user_name }}
|
||||
password = {{ ceilometer_service_password }}
|
||||
|
||||
memcached_servers = {{ memcached_servers }}
|
||||
|
||||
|
@ -56,7 +60,8 @@ memcache_secret_key = {{ memcached_encryption_key }}
|
|||
telemetry_secret = {{ ceilometer_telemetry_secret }}
|
||||
|
||||
[service_credentials]
|
||||
os_auth_url = {{ keystone_service_internalurl }}
|
||||
#TODO: Keystone v2 API is being used until https://review.openstack.org/#/c/237537/ merges.
|
||||
os_auth_url = {{ keystone_service_internaluri }}/v2.0
|
||||
os_username = {{ ceilometer_service_user_name }}
|
||||
os_tenant_name = {{ ceilometer_service_tenant_name }}
|
||||
os_password = {{ ceilometer_service_password }}
|
||||
|
|
Loading…
Reference in New Issue