openstack/kolla-ansible
Code Issues Proposed changes

enable CORS for Gnocchi and Keystone for grafana datasource

Browse Source 
adding cors section to keystone and gnocchi templates when
grafana is enabled

Change-Id: I54f4c06ed64254df0f9481e461c9393a399212a3
Closes-bug: #1651796
This commit is contained in:
Narasimha SV 2017-04-06 09:30:03 -04:00 committed by Jeffrey Zhang
parent ffc4fb3793
commit 4566d1cfc9
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

@ -55,3 +55,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 %}