Andrew Bogott has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/393819 )
Change subject: Horizon puppettab: read puppet class info from the 'future' environment ...................................................................... Horizon puppettab: read puppet class info from the 'future' environment This will probably need to be changed back to 'production' after we upgrade to puppet 4 everywhere. Change-Id: Ibeef7b48de3b93ad8d87393cfc28ecac8d94049f --- M modules/openstack/templates/mitaka/horizon/local_settings.py.erb 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/openstack/templates/mitaka/horizon/local_settings.py.erb b/modules/openstack/templates/mitaka/horizon/local_settings.py.erb index 5bcea48..1c0681b 100644 --- a/modules/openstack/templates/mitaka/horizon/local_settings.py.erb +++ b/modules/openstack/templates/mitaka/horizon/local_settings.py.erb @@ -541,7 +541,7 @@ # Disable instance consoles for Horizon users CONSOLE_TYPE = False -PUPPETMASTER_API = "https://<%= scope.call_function(:hiera, ['labs_puppet_master']) %>:8140/puppet" +PUPPETMASTER_API = "https://<%= scope.call_function(:hiera, ['labs_puppet_master']) %>:8140/future" PUPPET_CONFIG_BACKEND = "http://<%= scope.call_function(:hiera, ['labs_puppet_master']) %>:8101/v1" LDAP_USER = "uid=novaadmin,ou=people,dc=wikimedia,dc=org" -- To view, visit https://gerrit.wikimedia.org/r/393819 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibeef7b48de3b93ad8d87393cfc28ecac8d94049f Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Andrew Bogott <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: Andrew Bogott <[email protected]> Gerrit-Reviewer: Volans <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
