diff --git a/defaults/main.yml b/defaults/main.yml index ebdb3c1..dd7818e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -26,6 +26,9 @@ blazar_git_repo: https://git.openstack.org/openstack/blazar blazar_git_install_branch: master blazar_developer_mode: false +# Enable/Disable Ceilometer +blazar_ceilometer_enabled: False + # TODO(odyssey4me): # This can be simplified once all the roles are using # python_venv_build. We can then switch to using a diff --git a/templates/blazar.conf.j2 b/templates/blazar.conf.j2 index 0a8c7ab..2bfe317 100644 --- a/templates/blazar.conf.j2 +++ b/templates/blazar.conf.j2 @@ -11,6 +11,7 @@ transport_url = {{ blazar_oslomsg_rpc_transport }}://{% for host in blazar_oslom ssl = {{ blazar_oslomsg_notify_use_ssl | bool }} [oslo_messaging_notifications] +driver = {% if blazar_ceilometer_enabled %}messagingv2{% else %}noop{% endif %} transport_url = {{ blazar_oslomsg_notify_transport }}://{% for host in blazar_oslomsg_notify_servers.split(',') %}{{ blazar_oslomsg_notify_userid }}:{{ blazar_oslomsg_notify_password }}@{{ host }}:{{ blazar_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ blazar_oslomsg_notify_vhost }}{% if (blazar_oslomsg_notify_use_ssl | lower) | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} @@ -27,4 +28,4 @@ password={{ blazar_service_password }} auth_url={{ keystone_service_adminuri }} [database] -connection = mysql+pymysql://{{ blazar_galera_user }}:{{ blazar_container_mysql_password }}@{{ blazar_galera_address }}/{{ blazar_galera_database }}?charset=utf8{% if blazar_galera_use_ssl | bool %}&ssl_ca={{ blazar_galera_ssl_ca_cert }}{% endif %} \ No newline at end of file +connection = mysql+pymysql://{{ blazar_galera_user }}:{{ blazar_container_mysql_password }}@{{ blazar_galera_address }}/{{ blazar_galera_database }}?charset=utf8{% if blazar_galera_use_ssl | bool %}&ssl_ca={{ blazar_galera_ssl_ca_cert }}{% endif %}