From 9453dd8a8316e120108450356682730dc302dd8e Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 20 Aug 2016 15:05:58 +0000 Subject: [PATCH] Shorten wiki.o.o hiera keys 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 --- manifests/site.pp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 0213ff54f7..a985d046f3 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -372,19 +372,19 @@ node 'etherpad-dev.openstack.org' { # Node-OS: trusty node 'wiki.openstack.org' { class { 'openstack_project::wiki': - sysadmins => hiera('sysadmins', []), - ssl_cert_file_contents => hiera('wiki_ssl_cert_file_contents'), - ssl_key_file_contents => hiera('wiki_ssl_key_file_contents'), - ssl_chain_file_contents => hiera('wiki_ssl_chain_file_contents'), - wg_dbserver => hiera('wiki_wg_dbserver'), - wg_dbname => 'openstack_wiki', - wg_dbuser => 'wikiuser', - wg_dbpassword => hiera('wiki_wg_dbpassword'), - wg_secretkey => hiera('wiki_wg_secretkey'), - wg_upgradekey => hiera('wiki_wg_upgradekey'), - wg_recaptchasitekey => hiera('wiki_wg_recaptchasitekey'), - wg_recaptchasecretkey => hiera('wiki_wg_recaptchasecretkey'), - wg_googleanalyticsaccount => hiera('wiki_wg_googleanalyticsaccount'), + sysadmins => hiera('sysadmins', []), + ssl_cert_file_contents => hiera('ssl_cert_file_contents'), + ssl_key_file_contents => hiera('ssl_key_file_contents'), + ssl_chain_file_contents => hiera('ssl_chain_file_contents'), + wg_dbserver => hiera('wg_dbserver'), + wg_dbname => 'openstack_wiki', + wg_dbuser => 'wikiuser', + wg_dbpassword => hiera('wg_dbpassword'), + wg_secretkey => hiera('wg_secretkey'), + wg_upgradekey => hiera('wg_upgradekey'), + wg_recaptchasitekey => hiera('wg_recaptchasitekey'), + wg_recaptchasecretkey => hiera('wg_recaptchasecretkey'), + wg_googleanalyticsaccount => hiera('wg_googleanalyticsaccount'), } }