opendev/system-config
Code Issues Proposed changes

Merge "Install the limestone cacert"

Browse Source
This commit is contained in:
Zuul 2018-03-15 22:41:39 +00:00 committed by Gerrit Code Review
commit bbb9f2a2eb
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hiera/common.yaml
View File

@ -612,6 +612,30 @@ infracloud_chocolate_ssl_cert_file_contents: |
hSjXxXxM4KpXfGZQ8rdvB+TrladcBpRqsaFXN07BRU6OWZ59z6b1KFEV//XOkj8h hSjXxXxM4KpXfGZQ8rdvB+TrladcBpRqsaFXN07BRU6OWZ59z6b1KFEV//XOkj8h
osIiNUq7LRJe9znYYeHvQVcp8vQhxBsfgv7IFW89gntNCpq7YITCVQ== osIiNUq7LRJe9znYYeHvQVcp8vQhxBsfgv7IFW89gntNCpq7YITCVQ==
-----END CERTIFICATE----- -----END CERTIFICATE-----
limestone_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIIDzTCCArWgAwIBAgIJAMjKv/sJrt0JMA0GCSqGSIb3DQEBCwUAMH0xCzAJBgNV
BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEUMBIGA1UEBwwLU2FuIEFudG9uaW8xCzAJ
BgNVBAoMAklUMRowGAYDVQQDDBFvc2EuY29udGludW91cy5wdzEfMB0GA1UdEQwW
SVAuMT1vc2EuY29udGludW91cy5wdzAeFw0xODAzMDIxNTM1NDZaFw0yODAyMjgx
NTM1NDZaMH0xCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEUMBIGA1UEBwwL
U2FuIEFudG9uaW8xCzAJBgNVBAoMAklUMRowGAYDVQQDDBFvc2EuY29udGludW91
cy5wdzEfMB0GA1UdEQwWSVAuMT1vc2EuY29udGludW91cy5wdzCCASIwDQYJKoZI
hvcNAQEBBQADggEPADCCAQoCggEBANjzeNQOfZPLWEYXcyn4htcjli6QCT8FKU8I
edvaPDEjefcdBmD2f49bc8RRqbB8cje/B6vAAeBfXoQKoh5HQ/rec1S2aSQsYObl
ecaQTYKVVVUsAhbsmLf39rpqIhmKKA+qZCAJPsdtUQ2fTfwNnF2+9XhZ40LsZDse
cCCtwM3sKq5OymZ1JsHKMp1FEJINDAiV1aekmNjoaOeCCbuEgKKiniGJ7iVp18x8
80tGUwFq2gXrlmzYQntA80vN9MtWgnkn5KACVvE3vLpzPyKRsn5htsedmccNWGa5
eQHgAIoaP1AI57ryZHOFQxebWCWanxm19RdekyhTeqsGSso70b8CAwEAAaNQME4w
HQYDVR0OBBYEFHHOdo0iyJbl15Q3/61oYMMAGLH1MB8GA1UdIwQYMBaAFHHOdo0i
yJbl15Q3/61oYMMAGLH1MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEB
AAFh2mLQmGePooS/OoDNfeTORVSmq3u+l/F+5XGSSXjujY3tkl8AvXhvwVRKYFkE
y8viOR8yTvT6kyA7jQ2Fe2g0CVK+TyxpFiXQgCxISN9zAM/E2mGiM4FXqkrkl6vs
XacpMa7FAr1ZCp//rWT8NDPPMdq1L5BO4BEpE1tseaJSRv8SWztLpQZUic4YgvN2
HKnG4qpuA90nrDL30uB/dQxcVad4lG9f2vXYgbjg6QMyY1s4VVd3v9w+do8GLeia
ddlRJ6Pnmk26Kgs/0WoVVBNYVUrdo+Hk0k2BpO0/Yk+0+rz8wa+Ee4vAA3M4xT1p
NhQjSPoo+M+vDa6hxK8/Z/c=
-----END CERTIFICATE-----
statusbot_auth_nicks: statusbot_auth_nicks:
- jeblair - jeblair
- corvus - corvus

8
manifests/site.pp
View File

@ -191,6 +191,14 @@ node 'puppetmaster.openstack.org' {
content => hiera('infracloud_chocolate_ssl_cert_file_contents'), content => hiera('infracloud_chocolate_ssl_cert_file_contents'),
require => Class['::openstack_project::puppetmaster'], require => Class['::openstack_project::puppetmaster'],
} }
file { '/etc/openstack/limestone_cacert.pem':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
content => hiera('limestone_ssl_cert_file_contents'),
require => Class['::openstack_project::puppetmaster'],
}
} }
# Node-OS: trusty # Node-OS: trusty