From 8e77b81643ad58566956c11172768ce99f309cb6 Mon Sep 17 00:00:00 2001 From: Sergey Kulanov Date: Wed, 27 Apr 2016 11:39:36 +0300 Subject: [PATCH] Remove centos bootstrap private key We can freely remove id_rsa for centos bootstrap, because: 1. CentOS bootstrap was deprecated and removed in 9.0 fuel; 2. Related fix (which stores backward compatibility to early fuel versions) was merged to fuel-devops tool [1, 2] [1]. https://review.openstack.org/#/c/280625/ [2]. https://review.openstack.org/#/c/306994/ Change-Id: I5e34160f72a46fd9bec46304ed0c381d82c4b220 Closes-Bug: #1575558 --- bootstrap/ssh/id_rsa | 27 --------------------------- specs/fuel-main.spec | 4 +--- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 bootstrap/ssh/id_rsa diff --git a/bootstrap/ssh/id_rsa b/bootstrap/ssh/id_rsa deleted file mode 100644 index 739aa99b7..000000000 --- a/bootstrap/ssh/id_rsa +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA7a1U0jPLRneBPJISZ9oHzf9n8pp1/9GCgBklWU1gzSHGC+c1 -05UsK3HJ//BIJpzbCTcbnCUU/qFqqwxmhWnobsJWPyAapudCiVWlK+UGMzlKalaR -SKaF91MBEwsXEgdS4kGGwr6yXKjj0OGbvXzITBimgF9aIczrpp+HM7iw2CLwpz56 -FOUQ1re4NRmhRZcxlNyRaKI+/2lhSTKiS4p72st769rxaQbztctvZyrvs4KWZM8y -QnNJ3aFarwflvQ2OkLYE0ln3d2RP/L4OIfEFfB/scai/7lgsQ5L9mN674gB4r0f1 -ftWAkkB9DQSazUpEY3fta6C4XBBk+/2BJ24FVQIDAQABAoIBAHbFfXOlqllGcvC/ -1i7Lh8brcRiNE5aJLfuxlTZxMoSP8hYUrpNTIkV7kYQyoPuauuJ6BXQcG8e7BkD/ -62OULzDaMJtPAcKSIm/aurWat2R1prhJFkUF4kBb3FeV3SuHOWYTdLJw9VTUmTPS -6i7g4n8UenAANlxZuREE+11fWBBJPwmcStwGq9qVn+SydLsSxU0g8cGqd+edYV2p -zBINA88iEkEAQzmK8Pmm9Dqbf5trnSGjqe5tkqxV1CEvb3LcIkxlJgMaWoJNF5ip -Ajl/+WD16xEqbSnr9fAkKXdPbZJW9dPckC6gxeiRx2TXl44XXGX6phv/JUzb+b5n -in+lG0ECgYEA+T6CnPKcKnEO+82Kj14vt+UMZADCDN9i42kodwYJSLlQljiAYRhq -/SmjSNV0A77udpKtN/VFkpssRxFiuazOL4IVJyoQnYNRC0Mov6yexYsejmW7B6xd -YPvPkFPShSMXR16l0Qs0K3sE2QvsNHqzF+mOyriCturF/sjQATrBQgkCgYEA9B6O -xdpfudjh+3/Jx03a4SqQ8r5n6hG56SUJi7dfCpt8Sx94vBsoHThog9u132D47OR2 -9xyL3kwhbux1IAn3UpvR07pjKlwSsNlIjeU5lrdWqfxwjf9XLI08/yaeJYDzamsF -EkaxGjxFeXXe2W9pZQ8wCH4kC7K5DI3PrOyhi+0CgYEA2tDGWoOkFp6rSOVqf/Nw -cUHlXuZLdoGnj38Cx3vFKtOGrFtuWc/WHewwLgE3mRJGyFJ9QGNUcSFJ/hqFUf0k -BxFtALUtYRuoSvrrC1vBCCza5qjpShNI55wq3cq5R6lHBqFRcfUkGAgoeWS+OlR+ -Zr/lXJQgLfZvXP9vnaS3hgECgYBDiUywehivnsvuO01EgUqDrrYJIho3jI3lbWS1 -rZZypc9+LQfG6rBvXRK1IAyx7u8PAqnS9afQaTl6qZpBseAlj4w+SjtzFaPqH0LO -VtNW2gP05Szya+jfH3f3kuR/tawiDdeKVdpbSr9hufVcLFF5Lvl38AXi4qAFVBpX -WePbhQKBgQDl0Y0Nzj4zKb+tD3+Cg8/c0xLGqiyKoX+87c9Dru+aWudfZEjrwi2F -Ui3iN31rrEl+OqwJnC4gR+hWuDuF9gVMb17GoiM/fcvgzes9NL1YWFeKHU8ZKRox -w3nxStHyiETfTyC9LOS1JCfFIMcpYD0lFuHnQHib/HX3dmUvbqo77Q== ------END RSA PRIVATE KEY----- diff --git a/specs/fuel-main.spec b/specs/fuel-main.spec index b85846c19..7f6b0c02d 100644 --- a/specs/fuel-main.spec +++ b/specs/fuel-main.spec @@ -41,8 +41,6 @@ mkdir -p %{buildroot}/etc/yum/vars/ mkdir -p %{buildroot}/etc/yum.repos.d echo %{fuel_release} > %{buildroot}%{_sysconfdir}/fuel_release echo %{fuel_release} > %{buildroot}%{_sysconfdir}/yum/vars/fuelver -install -D -m 700 -d %{buildroot}/root/.ssh -install -p -m 600 %{_builddir}/%{name}-%{version}/bootstrap/ssh/id_rsa %{buildroot}/root/.ssh/bootstrap.rsa # copy GPG key install -D -m 644 %{_builddir}/%{name}-%{version}/fuel-release/RPM-GPG-KEY-mos %{buildroot}/etc/pki/fuel-gpg/RPM-GPG-KEY-mos # copy yum repos and mirror lists to /etc/yum.repos.d @@ -56,7 +54,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root) -/root/.ssh/bootstrap.rsa + %package -n fuel-release