From d95144e43b5333b1967611b446df6923d454dc6e Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 7 Nov 2022 15:10:29 -0500 Subject: [PATCH] Retire mordred as infra-root It has been over two years since I stopped working on OpenDev as part of my job, and in that time I haven't found enough time to keep up with the project as much as I otherwise might have hoped. As a result, it's really not appropriate to continue to hold elevated privileges, as I no longer have sufficient context to be helpful. Best wishes to everyone! Maybe one day I'll be lucky enough to be able to return. Change-Id: If2be80520a0c121698c586e3fa93d94d58a41943 --- inventory/base/group_vars/all.yaml | 2 +- inventory/service/group_vars/eavesdrop.yaml | 1 - manifests/site.pp | 2 +- modules/openstack_project/files/storyboard/dev_superusers.yaml | 2 -- modules/openstack_project/files/storyboard/superusers.yaml | 2 -- playbooks/roles/openafs-server-config/files/UserList | 1 - 6 files changed, 2 insertions(+), 8 deletions(-) diff --git a/inventory/base/group_vars/all.yaml b/inventory/base/group_vars/all.yaml index ff177a5dd7..5100656a06 100644 --- a/inventory/base/group_vars/all.yaml +++ b/inventory/base/group_vars/all.yaml @@ -165,7 +165,6 @@ all_users: # List of users to install on all hosts base_users: - - mordred - corvus - clarkb - fungi @@ -184,6 +183,7 @@ disabled_users: - shrews - dmsimard - pabelanger + - mordred # Default distro cloud image names to remove disabled_distro_cloud_users: - ubuntu diff --git a/inventory/service/group_vars/eavesdrop.yaml b/inventory/service/group_vars/eavesdrop.yaml index ca6a3318f9..9c643c332f 100644 --- a/inventory/service/group_vars/eavesdrop.yaml +++ b/inventory/service/group_vars/eavesdrop.yaml @@ -190,7 +190,6 @@ statusbot_auth_nicks: - jeblair - corvus - fungi - - mordred - clarkb - ianw - frickler diff --git a/manifests/site.pp b/manifests/site.pp index ee5ea934a0..df768abe54 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -54,7 +54,7 @@ node /^translate\d+\.open.*\.org$/ { $group = "translate" class { 'openstack_project::server': } class { 'openstack_project::translate': - admin_users => 'aeng,cboylan,eumel8,ianw,ianychoi,infra,jaegerandi,mordred,stevenk', + admin_users => 'aeng,cboylan,eumel8,ianw,ianychoi,infra,jaegerandi,stevenk', openid_url => 'https://id.openinfra.dev', listeners => ['ajp'], from_address => 'noreply@openstack.org', diff --git a/modules/openstack_project/files/storyboard/dev_superusers.yaml b/modules/openstack_project/files/storyboard/dev_superusers.yaml index 2c8be7cb8b..c44715d12b 100644 --- a/modules/openstack_project/files/storyboard/dev_superusers.yaml +++ b/modules/openstack_project/files/storyboard/dev_superusers.yaml @@ -2,8 +2,6 @@ email: slukjanov@mirantis.com - openid: https://login.ubuntu.com/+id/cWwF3rJ email: corvus@gnu.org -- openid: https://login.ubuntu.com/+id/4dfrAmY - email: mordred@inaugust.com - openid: https://login.ubuntu.com/+id/43rCcdx email: fungi@yuggoth.org - openid: https://login.ubuntu.com/+id/DJtBT7D diff --git a/modules/openstack_project/files/storyboard/superusers.yaml b/modules/openstack_project/files/storyboard/superusers.yaml index 9c5c9f845b..cb9f9cee33 100644 --- a/modules/openstack_project/files/storyboard/superusers.yaml +++ b/modules/openstack_project/files/storyboard/superusers.yaml @@ -2,8 +2,6 @@ email: slukjanov@mirantis.com - openid: https://login.ubuntu.com/+id/cWwF3rJ email: corvus@gnu.org -- openid: https://login.ubuntu.com/+id/4dfrAmY - email: mordred@inaugust.com - openid: https://login.ubuntu.com/+id/43rCcdx email: fungi@yuggoth.org - openid: https://login.ubuntu.com/+id/DJtBT7D diff --git a/playbooks/roles/openafs-server-config/files/UserList b/playbooks/roles/openafs-server-config/files/UserList index 2efbe19c07..d93ac39000 100644 --- a/playbooks/roles/openafs-server-config/files/UserList +++ b/playbooks/roles/openafs-server-config/files/UserList @@ -1,5 +1,4 @@ corvus.admin -mordred.admin fungi.admin service.afsadmin nibz.admin