From c72ef60ea471d80fbd14e0e4213cb9018f3ca34b Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Mon, 20 Nov 2017 22:54:27 +0000 Subject: [PATCH] Revert "Install ssh keys of tripleo ci admins on nodes" It was highly inappropriate to add new ci admins in this change, especially without mentioning it in the commit message. Note that strictly speaking we require a quorum of the existing admins to approve adding new ones, although with the number of admins growing we may want to revisit that policy. As of this time it is still in effect, however.[1] And even if it weren't, it shouldn't have been piggy-backed on this change. Please resubmit as two separate changes so the admin change can be properly reviewed. 1: Unfortunately we lost the documentation of this when the admin list was moved from tripleo-incubator to tripleo-ci: https://github.com/openstack/tripleo-incubator/blob/4de13b35d91150eb269bea22820d0e688cd6b643/tripleo-cloud/README.md That should be fixed too. This reverts commit a4d1f8c9605299053ec3e4b19f4b885ea2d0619f. Change-Id: I6a5484dfb1c00431ae89ec20d9dd66b623b3e622 --- scripts/tripleo-cd-admins | 2 -- toci_gate_test-oooq.sh | 2 -- 2 files changed, 4 deletions(-) diff --git a/scripts/tripleo-cd-admins b/scripts/tripleo-cd-admins index 57f4d503a..3aab22d14 100644 --- a/scripts/tripleo-cd-admins +++ b/scripts/tripleo-cd-admins @@ -6,5 +6,3 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDhi/BqsZibuAPiUjJe7b3Dqe5nyI7BckOwfGwJYg4 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYt5FqMTz91Mbctj7wWg2tAkzwMDwDFtvw0l/6SGPqV+w84SxM1sRmCm1iGdjCk7Rhy3493yRMrA6RT02yTQnXyXG5xC9stspWku9GPNNXyg83SvC/iz53E5SWwYQISmgBK+dYNwzjiN8C8ohxmT8elV1ElckgGvzTOk80KygUzpf+KOfezQcSXZWxBbYsK/8FamPBoWGLCByv+zVX+dSjNgraqdGZDlXns+NiZAeEHeBwKTufFpN//1xm4lG+ah4g5oqaXNf1M7LApPSSm4r5VdFp0+S5SbcPocu+ztwttstnLI0fgJ5XUyqUJM0fZbaj1qkhFeG7bCi/75XIjnkp emilien@redhat.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMZI3iVVe8UO6NdHJrGUwglumu4Tgz0yBzQky5aJtuFBfPLAd0LKz2dCq91oXUZ1EprKJgxU9cB2ydFcd2baHDstsJDf0Rg3wvZdwtM8g7q6xsOE/uhwn192ZQR2EK6HlfjUoNTYJvRsuTHJ9u+xpAsLjau6I/A7aE9U7yNhJNfiGBagEdelvKujSyxdWq9ZBMFb5HKLg346OaD0xHJFS/574mKlCZkq991i8pf8nGheIkJ1XtRWCtbc8v0vKccgxVlHUxFegRTsrKIHnQfm0JHnpLaf24yrXEJhnwYHqKH5fYN6IeReV3bq0A08vH4O/O5+BJRM0J/WXhXOTvjy6pZlLyjF7KOTpESz0EZYuWgvRC2+QHTwXlAtlILnjx8N8Al0pVwz/IJ0bdZzS7+usaZvka350aCaHyRXtuwtydd1lOkz34nbJAEzsCmeaS8JH/EWfD5BuaqaZRMs2GkMEK3Ey9JVOGGb4wiHDOk3f+IQHMMz9y7Cv17jeQ+CBgFUqb1mACjg2fXnyDJCcA7EXFB+ksI4slg0rei37DOXSDe8lFhwtMum9UQf8HpYJkepbMRa3OvdibrXeGCb3+SoAE0EKLkzqKSK+UfNA2hX8a1IKsTDGLF8b91AS2NaYUISHCRCLNhwEGeDAjjkIhxy3K94nTTHbHRrRhnVvZeDDC4Q== josorior@redhat.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiJ2p/mxivnTas4Dw5d8mBs+KJMP/qk3HAQ7DPx0kcVUXPL1lgD7TowtdpOn5tyjsGg73/b+SzmrUyRdwsUHmTXL7H8pgdar+fYwCbNmmzhToCnB2GpMqQ1W1F6icJt1d0QXeUvJMGQz/X9p9X9I5LciFEzfA04sFTn+nUXyhdB3Tt/wHFEI4xXjIvbK7wx4QMGRDDJJGT3KbmhKOSWljILgPB54i10wg3xJLfW8fwiF2J160j6wsHztuJLT/v8ZhanEq/euNQ6vEApAvbVHpEg5aPO3x9/7ZFZ5K4TN0YGJ22ffkYvaaauNc5sdvTyV5j9jg5xJtdyVcxyBxc66Of gcerami@redpanda -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCmP0tzPXxbD6KEIxNvxh5JJiibKaqix7LpyUUCAtv4d8oqgRnU1De9gChmxTbUPYcKHi3jaVdBqMQ18OyeySAInZGQMOwLKAdHBnriHAc0nubTkzfS5ngXERssWqcN0KGJbL7FqQHOAOY5x0uEh2P8YZLCP/1JoSdruIY4FIK1b8epbwhwtBZC4+vqDjqoZgCeuOp1NXoobaqO10wcBSIyP6h6+TdUMskn2HB5ZeIOeyqj7FLzdPeqQOFtss5Kx5eBNBMIsZc6bxHQ+zR0n2nrN1NFfbAxaHxHplIdX9YgDo7WwsX/cpedEQ5HqfLZdAXtCL0COExthI3wVFGmWc71 adarazs.keys -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDP4msjXwi+7fJp5aMuo+Nc06qdAZnNN3xCz+ExEaUwNgfhxJ83eXk4jQx8tILk1m6oGcr84Cq/ObjUIHTXmpoUwj7SKtGhAyXPtRiyO5V2udzVbVUTDhhYeGJKuanu+4q84JZsIvd+jmflSkMelK/X0pHIqCbkuVBpga21LegyFJrSS6uZvVvHJnVmz9++844UxIjlR63gOa3x8TdXITY2WkapqLIauKaM2NrCgJGn7OROzGFSYYpL36LuD3eEheBNgtSyw/pDeU+IISatBUX7hCUjtpFHv8OJdvdl8s8WtdMLAzcxSFsnLMp7GdBJsB5ZC1NVJ+g+nGA0Twi71AI/ trown diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh index 7ba053c1e..68da3859a 100755 --- a/toci_gate_test-oooq.sh +++ b/toci_gate_test-oooq.sh @@ -47,8 +47,6 @@ if [ -f /etc/nodepool/provider ] ; then # CI the ones we are interested in have been cloned to /opt/stack/new. We # can also remove some distro images cached on the images. sudo rm -rf /opt/git /opt/stack/cache/files/mysql.qcow2 /opt/stack/cache/files/ubuntu-12.04-x86_64.tar.gz - mkdir -p $HOME/.ssh/ - cat $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo-cd-admins >> $HOME/.ssh/authorized_keys fi fi