Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373125 )
Change subject: add explicit keystone_public_port to labs hiera ...................................................................... add explicit keystone_public_port to labs hiera Change-Id: I6507201db42edc100d53b17ae9473b4773ab7731 --- M hieradata/labs.yaml M modules/shinken/templates/shinkengen.yaml.erb 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml index b6ec558..d085d2e 100644 --- a/hieradata/labs.yaml +++ b/hieradata/labs.yaml @@ -86,8 +86,7 @@ puppetmaster: "labs-puppetmaster.wikimedia.org" saltmaster: "labcontrol1001.wikimedia.org" mysql::server::use_apparmor: false # The images we have for debian don't support it -keystoneconfig: - public_port: '5000' +keystone_public_port: '5000' # All labs instances have internet connectivity, so do not bother with proxies profile::base::use_apt_proxy: false diff --git a/modules/shinken/templates/shinkengen.yaml.erb b/modules/shinken/templates/shinkengen.yaml.erb index c3adee3..c26a1c2 100644 --- a/modules/shinken/templates/shinkengen.yaml.erb +++ b/modules/shinken/templates/shinkengen.yaml.erb @@ -2,5 +2,5 @@ output_path: '/etc/shinken/generated' site: <%= scope.lookupvar("::site") %> keystone_host: <%= scope.function_hiera(['labs_keystone_host']) %> -keystone_port: <%= scope.function_hiera(['keystoneconfig:public_port']) %> +keystone_port: <%= scope.function_hiera(['keystone_public_port']) %> puppet_enc_host: <%= scope.function_hiera(['labs_puppet_master']) %> -- To view, visit https://gerrit.wikimedia.org/r/373125 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6507201db42edc100d53b17ae9473b4773ab7731 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits