Andrew Bogott has submitted this change and it was merged.
Change subject: Include a designate policy file for Horizon.
......................................................................
Include a designate policy file for Horizon.
This is in anticipation of actually having a designate dashboard.
Change-Id: Id8a97d43b138be50d685cb1aa51136d9c4f1ac9c
---
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
2 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/horizon/service.pp
b/modules/openstack/manifests/horizon/service.pp
index be215da..3e72db9 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -79,6 +79,14 @@
require => Package['openstack-dashboard'],
mode => '0440',
}
+ file { '/etc/openstack-dashboard/designate_policy.json':
+ source =>
"puppet:///modules/openstack/${openstack_version}/designate/policy.json",
+ owner => 'horizon',
+ group => 'horizon',
+ notify => Service['apache2'],
+ require => Package['openstack-dashboard'],
+ mode => '0440',
+ }
file {
'/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/img/logo.png':
source =>
'puppet:///modules/openstack/horizon/216px-Wikimedia_labs_dashboard_logo.png',
diff --git a/modules/openstack/templates/liberty/horizon/local_settings.py.erb
b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
index c5b0f5f..3727675 100644
--- a/modules/openstack/templates/liberty/horizon/local_settings.py.erb
+++ b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
@@ -283,6 +283,7 @@
'compute': 'nova_policy.json',
# 'volume': 'cinder_policy.json',
'image': 'glance_policy.json',
+ 'dns': 'designate_policy.json',
}
# Trove user and database extension support. By default support for
--
To view, visit https://gerrit.wikimedia.org/r/275715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id8a97d43b138be50d685cb1aa51136d9c4f1ac9c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
