Remove embedded keystone policy config change
Currently keystone policy file (policy.json) is from a custom file patched into keystone source tree. This update removed the patched file from keystone and instead use a puppet template to generate one at system configuration time (puppet manifest apply). Story: 2003110 Task: 23229 Depends-On: https://review.openstack.org/594523 Change-Id: I5f6e3f8aaf4a6b40a4f5f230e2d68280324ef10f Signed-off-by: Andy Ning <andy.ning@windriver.com>
This commit is contained in:
parent
f8363efc7f
commit
589d4128f2
@ -212,9 +212,6 @@ install -p -D -m 755 tools/sample_data.sh %{buildroot}%{_datadir}/keystone/sampl
|
||||
# Install apache configuration files
|
||||
install -p -D -m 644 httpd/wsgi-keystone.conf %{buildroot}%{_datadir}/keystone/
|
||||
|
||||
# WRS: install policy rules
|
||||
install -p -D -m 640 etc/policy.wrs.json %{buildroot}%{_sysconfdir}/keystone/policy.json
|
||||
|
||||
# WRS install keystone cron script
|
||||
install -p -D -m 755 %{SOURCE101} %{buildroot}%{_bindir}/keystone-fernet-keys-rotate-active
|
||||
|
||||
@ -282,7 +279,6 @@ exit 0
|
||||
%config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/logging.conf
|
||||
%config(noreplace) %attr(0640, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates
|
||||
%config(noreplace) %attr(0640, keystone, keystone) %{_sysconfdir}/keystone/keystone.policy.yaml
|
||||
%config(noreplace) %attr(0640, keystone, keystone) %{_sysconfdir}/keystone/policy.json
|
||||
%config(noreplace) %attr(0640, keystone, keystone) %{_sysconfdir}/keystone/sso_callback_template.html
|
||||
# WRS: add password rules configuration
|
||||
%attr(0440, root, keystone) %{_sysconfdir}/keystone/password-rules.conf
|
||||
|
Loading…
Reference in New Issue
Block a user