openstack/kolla-ansible
Code Issues Proposed changes

Merge "enable CORS for Gnocchi and Keystone for grafana datasource"

Browse Source
This commit is contained in:
Jenkins 2017-08-15 09:15:46 +00:00 committed by Gerrit Code Review
commit e5d9295441
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ansible/roles/gnocchi/templates/gnocchi.conf.j2
View File

@ -59,3 +59,8 @@ ceph_username = gnocchi
ceph_keyring = /etc/ceph/ceph.client.gnocchi.keyring ceph_keyring = /etc/ceph/ceph.client.gnocchi.keyring
ceph_conffile = /etc/ceph/ceph.conf ceph_conffile = /etc/ceph/ceph.conf
{% endif %} {% endif %}
{% if enable_grafana | bool %}
[cors]
allowed_origin = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ grafana_server_port }}
{% endif %}

5
ansible/roles/keystone/templates/keystone.conf.j2
View File

@ -53,3 +53,8 @@ hmac_keys = {{ osprofiler_secret }}
connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }} connection_string = elasticsearch://{{ elasticsearch_address }}:{{ elasticsearch_port }}
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if enable_grafana | bool %}
[cors]
allowed_origin = {{ public_protocol }}://{{ kolla_external_fqdn }}:{{ grafana_server_port }}
{% endif %}