summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Zawadzki <mzawadzki@mirantis.com>2017-01-16 15:32:44 +0100
committerMarek Zawadzki <mzawadzki@mirantis.com>2017-01-16 15:46:41 +0100
commitb816b9d22e992c3e2c595cf039cd38990731f8ef (patch)
tree1d5ea012f1579e9e9ed1c29c4f7d673c529fe717
parent7e702f06753b872c0b0d61892573859aff8347fb (diff)
Add an option to enable notifications in keystone
By this option (disabled by default), user can enable notifications in keystone and configure their format (basic or CADF: Cloud Auditing Data Federation standard). Change-Id: I8dd5c2a24851d71db18399a709794d6c514e02b6
Notes
Notes (review): Verified+1: Mirantis CCP CI <mirantis-fuel-ccp-ci@mirantis.com> Code-Review+2: Artur Zarzycki <azarzycki@mirantis.com> Code-Review+1: Sergey Kraynev <skraynev@mirantis.com> Code-Review+1: Dmitry Klenov <dklenov@mirantis.com> Code-Review+2: Sergey Reshetnyak <sreshetniak@mirantis.com> Workflow+1: Sergey Reshetnyak <sreshetniak@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 17 Jan 2017 12:13:25 +0000 Reviewed-on: https://review.openstack.org/420740 Project: openstack/fuel-ccp-keystone Branch: refs/heads/master
-rw-r--r--service/files/defaults.yaml5
-rw-r--r--service/files/keystone.conf.j210
2 files changed, 15 insertions, 0 deletions
diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 32a2545..dbfb2bc 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -21,6 +21,11 @@ configs:
21 fernet_key: "ZAabsQIXsSW7Ez52UZRqUXDz87y9+R+mbxVZ38gRmjg=" 21 fernet_key: "ZAabsQIXsSW7Ez52UZRqUXDz87y9+R+mbxVZ38gRmjg="
22 credential_key: "2jjLrgOLvI-wj7g-8058SSCw0-ZnL4Ghg5cLuBirxL8=" 22 credential_key: "2jjLrgOLvI-wj7g-8058SSCw0-ZnL4Ghg5cLuBirxL8="
23 23
24 notifications:
25 enable: false
26 # format can be basic or cadf:
27 format: cadf
28
24 openstack: 29 openstack:
25 user_password: password 30 user_password: password
26 user_name: admin 31 user_name: admin
diff --git a/service/files/keystone.conf.j2 b/service/files/keystone.conf.j2
index b51eb84..5104bc5 100644
--- a/service/files/keystone.conf.j2
+++ b/service/files/keystone.conf.j2
@@ -3,6 +3,9 @@ debug = {{ keystone.debug }}
3use_syslog = False 3use_syslog = False
4use_stderr = True 4use_stderr = True
5max_token_size = 255 5max_token_size = 255
6{% if keystone.notifications.enable %}
7notification_format = {{ keystone.notifications.format }}
8{% endif %}
6 9
7[database] 10[database]
8connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address(service.database) }}/{{ keystone.db.name }} 11connection = mysql+pymysql://{{ keystone.db.username }}:{{ keystone.db.password }}@{{ address(service.database) }}/{{ keystone.db.name }}
@@ -22,3 +25,10 @@ provider = fernet
22 25
23[assignment] 26[assignment]
24driver = sql 27driver = sql
28
29{% if keystone.notifications.enable %}
30{# This section should be updated after https://review.openstack.org/#/c/419995/ is merged #}
31[oslo_messaging_notifications]
32driver = messagingv2
33transport_url = rabbit://{{ rabbitmq.user }}:{{ rabbitmq.password }}@{{ address('rabbitmq', rabbitmq.port) }}
34{% endif %}