opendev/system-config
Code Issues Proposed changes

Shorten wiki.o.o hiera keys

Browse Source 
Now that we're using per-host hiera files, we no longer need
namespaced prefixes on our hiera keys. Accordingly, shorten the
hiera keys for wiki.openstack.org to more generic names.

Change-Id: I7bf73962cd9a68e637a0cbb3183cd22b612fd9b6
This commit is contained in:
Jeremy Stanley 2016-08-20 15:05:58 +00:00
parent f74bcccbb0
commit 9453dd8a83
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manifests/site.pp
View File

@ -372,19 +372,19 @@ node 'etherpad-dev.openstack.org' {
# Node-OS: trusty # Node-OS: trusty
node 'wiki.openstack.org' { node 'wiki.openstack.org' {
class { 'openstack_project::wiki': class { 'openstack_project::wiki':
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
ssl_cert_file_contents => hiera('wiki_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('ssl_cert_file_contents'),
ssl_key_file_contents => hiera('wiki_ssl_key_file_contents'), ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_chain_file_contents => hiera('wiki_ssl_chain_file_contents'), ssl_chain_file_contents => hiera('ssl_chain_file_contents'),
wg_dbserver => hiera('wiki_wg_dbserver'), wg_dbserver => hiera('wg_dbserver'),
wg_dbname => 'openstack_wiki', wg_dbname => 'openstack_wiki',
wg_dbuser => 'wikiuser', wg_dbuser => 'wikiuser',
wg_dbpassword => hiera('wiki_wg_dbpassword'), wg_dbpassword => hiera('wg_dbpassword'),
wg_secretkey => hiera('wiki_wg_secretkey'), wg_secretkey => hiera('wg_secretkey'),
wg_upgradekey => hiera('wiki_wg_upgradekey'), wg_upgradekey => hiera('wg_upgradekey'),
wg_recaptchasitekey => hiera('wiki_wg_recaptchasitekey'), wg_recaptchasitekey => hiera('wg_recaptchasitekey'),
wg_recaptchasecretkey => hiera('wiki_wg_recaptchasecretkey'), wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'),
wg_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'), wg_googleanalyticsaccount => hiera('wg_googleanalyticsaccount'),
} }
} }