From 6e689c955bb22b92d0baac394a05c86d84830b4b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 13 Dec 2016 11:21:35 -0600 Subject: [PATCH] Switch storyboard to login.ubuntu.com Change-Id: Ia8d0ecdcb6a6ee46f40688b982510797455d2b75 --- doc/source/storyboard.rst | 2 +- .../files/storyboard/superusers.yaml | 12 ++++++------ modules/openstack_project/manifests/storyboard.pp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/source/storyboard.rst b/doc/source/storyboard.rst index 1f6f644168..2b0cec8257 100644 --- a/doc/source/storyboard.rst +++ b/doc/source/storyboard.rst @@ -78,7 +78,7 @@ Launchpad OpenID string and email as follows: ``:config:`gerrit/projects.yaml```:: - - openid: https://login.launchpad.net/+id/LOLPONIES + - openid: https://login.ubuntu.com/+id/LOLPONIES email: pinkie.pie@example.com diff --git a/modules/openstack_project/files/storyboard/superusers.yaml b/modules/openstack_project/files/storyboard/superusers.yaml index bdef60bf2c..9c5c9f845b 100644 --- a/modules/openstack_project/files/storyboard/superusers.yaml +++ b/modules/openstack_project/files/storyboard/superusers.yaml @@ -1,12 +1,12 @@ -- openid: https://login.launchpad.net/+id/eMmhAdr +- openid: https://login.ubuntu.com/+id/eMmhAdr email: slukjanov@mirantis.com -- openid: https://login.launchpad.net/+id/cWwF3rJ +- openid: https://login.ubuntu.com/+id/cWwF3rJ email: corvus@gnu.org -- openid: https://login.launchpad.net/+id/4dfrAmY +- openid: https://login.ubuntu.com/+id/4dfrAmY email: mordred@inaugust.com -- openid: https://login.launchpad.net/+id/43rCcdx +- openid: https://login.ubuntu.com/+id/43rCcdx email: fungi@yuggoth.org -- openid: https://login.launchpad.net/+id/DJtBT7D +- openid: https://login.ubuntu.com/+id/DJtBT7D email: clark.boylan@gmail.com -- openid: https://login.launchpad.net/+id/whpdRxT +- openid: https://login.ubuntu.com/+id/whpdRxT email: lyz@princessleia.com diff --git a/modules/openstack_project/manifests/storyboard.pp b/modules/openstack_project/manifests/storyboard.pp index 87cd9ca9a6..01feb3626a 100644 --- a/modules/openstack_project/manifests/storyboard.pp +++ b/modules/openstack_project/manifests/storyboard.pp @@ -14,7 +14,7 @@ class openstack_project::storyboard( $ssl_key = undef, $ssl_key_file_contents = undef, $ssl_chain_file_contents = undef, - $openid_url = 'https://login.launchpad.net/+openid', + $openid_url = 'https://login.ubuntu.com/+openid', $project_config_repo = '', $hostname = $::fqdn, $valid_oauth_clients = [$::fqdn],