openstack/kolla-ansible
Code Issues Proposed changes

osprofiler support redis

Browse Source 
Currently osprofiler only choose elasticsearch,
which is only supported on x86.
On other platform like aarch64 osprofiler can
not be used since no elasticsearch package.

Enable osprofiler by enable_osprofiler: "yes",
which choose elasticsearch by default.
Choose redis by enable_redis: "yes" & osprofiler_backend: "redis"
On platform without elasticsearch support like aarch64
set enable_elasticsearch: "no"

Change-Id: I68fe7a33e11d28684962fc5d0b3d326e90784d78
This commit is contained in:
Zhangfei Gao 2018-04-24 14:08:28 +08:00
parent 9568f1c790
commit ce809aea23
18 changed files with 36 additions and 48 deletions
ansible
group_vars
all.yml
roles
cinder/templates
cinder.conf.j2
glance/templates
glance-api.conf.j2glance-registry.conf.j2
heat/templates
heat.conf.j2
keystone/templates
keystone.conf.j2
magnum/templates
magnum.conf.j2
mistral/templates
mistral.conf.j2
neutron/templates
neutron.conf.j2
nova/templates
nova.conf.j2
searchlight/templates
searchlight.conf.j2
senlin/templates
senlin.conf.j2
trove/templates
trove-conductor.conf.j2trove-taskmanager.conf.j2trove.conf.j2
vitrage/templates
vitrage.conf.j2
zun/templates
zun.conf.j2
etc/kolla
globals.yml

14
ansible/group_vars/all.yml

@ -541,6 +541,20 @@ elasticsearch_address: "{{ kolla_internal_fqdn }}"
enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_freezer | bool or enable_osprofiler | bool or enable_skydive | bool or enable_monasca | bool else 'no' }}"
enable_kibana: "{{ 'yes' if enable_central_logging | bool else 'no' }}"
####################
# Redis options
####################
redis_address: "{{ kolla_internal_fqdn }}"
####################
# Osprofiler options
####################
# valid values: ["elasticsearch", "redis"]
osprofiler_backend: "elasticsearch"
elasticsearch_connection_string: "elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}"
redis_connection_string: "redis://:{{ redis_master_password }}@{{ redis_address }}:{{ redis_port }}"
osprofiler_backend_connection_string: "{{ redis_connection_string if osprofiler_backend == 'redis' else elasticsearch_connection_string }}"
####################
# RabbitMQ options
####################

4
ansible/roles/cinder/templates/cinder.conf.j2

@ -203,9 +203,7 @@ helper_command=sudo cinder-rootwrap /etc/cinder/rootwrap.conf privsep-helper --c
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}
{% if enable_barbican | bool %}

4
ansible/roles/glance/templates/glance-api.conf.j2

@ -103,7 +103,5 @@ policy_file = {{ glance_policy_file }}
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/glance/templates/glance-registry.conf.j2

@ -50,7 +50,5 @@ policy_file = {{ glance_policy_file }}
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/heat/templates/heat.conf.j2

@ -103,7 +103,5 @@ enable_proxy_headers_parsing = True
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/keystone/templates/keystone.conf.j2

@ -52,9 +52,7 @@ driver = messagingv2
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}
{% if enable_grafana | bool %}

4
ansible/roles/magnum/templates/magnum.conf.j2

@ -103,7 +103,5 @@ policy_file = {{ magnum_policy_file }}
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/mistral/templates/mistral.conf.j2

@ -67,9 +67,7 @@ policy_file = {{ mistral_policy_file }}
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}
[coordination]

4
ansible/roles/neutron/templates/neutron.conf.j2

@ -152,9 +152,7 @@ ipv6_ptr_zone_prefix_size = 116
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}
{% if enable_opendaylight_qos | bool %}

4
ansible/roles/nova/templates/nova.conf.j2

@ -277,9 +277,7 @@ notify_on_state_change = vm_and_task_state
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}
{% if enable_barbican | bool %}

4
ansible/roles/searchlight/templates/searchlight.conf.j2

@ -129,7 +129,5 @@ notifications_topics_exchanges = ironic_versioned_notifications,ironic
{# enabled = true #}
{# trace_sqlalchemy = true #}
{# hmac_keys = {{ osprofiler_secret }} #}
{# {% if enable_elasticsearch | bool %} #}
{# connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }} #}
{# {% endif %} #}
{# connection_string = {{ osprofiler_backend_connection_string }} #}
{# {% endif %} #}

4
ansible/roles/senlin/templates/senlin.conf.j2

@ -62,7 +62,5 @@ policy_file = {{ senlin_policy_file }}
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/trove/templates/trove-conductor.conf.j2

@ -22,7 +22,5 @@ max_retries = -1
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/trove/templates/trove-taskmanager.conf.j2

@ -48,7 +48,5 @@ driver = noop
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/trove/templates/trove.conf.j2

@ -54,7 +54,5 @@ driver = noop
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/vitrage/templates/vitrage.conf.j2

@ -64,7 +64,5 @@ policy_file = {{ vitrage_policy_file }}
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}

4
ansible/roles/zun/templates/zun.conf.j2

@ -94,9 +94,7 @@ endpoint_type = internalURL
enabled = true
trace_sqlalchemy = true
hmac_keys = {{ osprofiler_secret }}
{% if enable_elasticsearch | bool %}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %}
connection_string = {{ osprofiler_backend_connection_string }}
{% endif %}
[oslo_concurrency]

6
etc/kolla/globals.yml

@ -162,6 +162,7 @@ kolla_internal_vip_address: "10.10.10.254"
#enable_congress: "no"
#enable_designate: "no"
#enable_destroy_images: "no"
#enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_freezer | bool or enable_osprofiler | bool or enable_skydive | bool else 'no' }}"
#enable_etcd: "no"
#enable_fluentd: "yes"
#enable_freezer: "no"
@ -306,6 +307,11 @@ kolla_internal_vip_address: "10.10.10.254"
# in glance, so default value should be set to "no".
glance_enable_rolling_upgrade: "no"
####################
# Osprofiler options
####################
# valid values: ["elasticsearch", "redis"]
#osprofiler_backend: "elasticsearch"
##################
# Barbican options