Add hpuswest public certificate to public hiera

Change-Id: I131b7e2badfe0a5ad1c1fd2248d3375cd7c4571c
Signed-off-by: Spencer Krum <nibz@spencerkrum.com>
This commit is contained in:
Spencer Krum 2016-02-19 15:45:21 -08:00
parent 61ed3e5198
commit 1c75db64a6
No known key found for this signature in database
GPG Key ID: 4A330B9AD648FAE3
2 changed files with 37 additions and 2 deletions

View File

@ -310,3 +310,38 @@ cacti_hosts:
- zm07.openstack.org - zm07.openstack.org
- zm08.openstack.org - zm08.openstack.org
- zuul.openstack.org - zuul.openstack.org
infracloud_hpuswest_ssl_cert_file_contents: |
-----BEGIN CERTIFICATE-----
MIIF2jCCA8ICCQCe7O3PwCh21DANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UEBhMC
VVMxEjAQBgNVBAgMCU9wZW5TdGFjazEmMCQGA1UECgwdT3BlblN0YWNrIEluZnJh
c3RydWN0dXJlIFRlYW0xLzAtBgNVBAMMJmNvbnRyb2xsZXIwMC5ocHVzd2VzdC5p
Yy5vcGVuc3RhY2sub3JnMTIwMAYJKoZIhvcNAQkBFiNvcGVuc3RhY2staW5mcmFA
bGlzdHMub3BlbnN0YWNrLm9yZzAeFw0xNjAyMTkyMjMzMTRaFw0xNzAyMTgyMjMz
MTRaMIGuMQswCQYDVQQGEwJVUzESMBAGA1UECAwJT3BlblN0YWNrMSYwJAYDVQQK
DB1PcGVuU3RhY2sgSW5mcmFzdHJ1Y3R1cmUgVGVhbTEvMC0GA1UEAwwmY29udHJv
bGxlcjAwLmhwdXN3ZXN0LmljLm9wZW5zdGFjay5vcmcxMjAwBgkqhkiG9w0BCQEW
I29wZW5zdGFjay1pbmZyYUBsaXN0cy5vcGVuc3RhY2sub3JnMIICIjANBgkqhkiG
9w0BAQEFAAOCAg8AMIICCgKCAgEArfSjaTZv4pBt0fh0z4FJ+VEuwQmw221bxhcE
0RJOKWTFuNbgWnLxdpij7opVR77BrH7RtZnOD3/QPjtofLLAdJm3k9VOPengHTdo
ZZb3KNlm8dOte7izqMpWHrM612QdYxFJCB7KoUplB6rV33/c/2E4zbfFV69uEFyc
KKpgIsnZ8aqLcG4U+ciK0tduFUTWjaGwk87hgzE6Mv/oWNE0/mjbnjaSypptIpTS
aSfEwMwpY0/Nfj588jxiIg6mYLbQuPhn8fN40oL05odijLoZqV6lNTnG4e+sKPay
+/vzGTcZnywPNroyPoR/55E8a8wc83MISvknych5+zG/F9aGCDzczVWn6w5E7Uiu
wHdwiyFPzZsaaqTlFuWCVpO3yHeVTt1v22pdH3+d+5jK/vu7cSwiUG6sf6hXj13T
+ANRfHLsRv69t4UUdaquEK82Urpoy7hIqGVSf3SwQR689zY8Dq5im1XNx5O1fYQv
FIz/FL1K9tCs6uYQtyyAvv0Q28WOdUN8NiJzpS69nLlc+ZAQVwEm2j8jvubGWh+k
5NbOimArGje2y3IT6sV1XMmwqlygojUlHcA/A2Pm95c6Txb6weYjd21iT4YFg20e
U59tyIDJLd77lhZrjgdlYqM0wP0AUNBR3w6Z93tJnFtyE2Sf3KxKIFzKjhfDZp4t
cr3mxpcCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAnYAYq28uViXaZlk4eZex6ieW
GJUD+snzEXbfQwHma6UHVYYd6FqYuTzWhUu0hFf8kBMUUCauy+hRvweiENPf9/H0
4FN+Be0dp0al/LnjAPzPaqgIGAoVkAj1acNLArozlLfSWsLeC5grc57n9wLmu7Yi
3vUiWnhJoSszGZvtzEBsdPAI3PbW0pfNxehzM4FEYgTDoA53Ro7r/f5gUsS9I1Gs
NXULB36MhmGhGhaYOSSm/05o+RS6/hPhUcEMetI9GNcOUAvWkQAU78h1WjA/oU24
iazfcpztfXThg12f/fh9wgbSrLWZWvfCUfKtgyMWDBWNq4Hs2o4vgqiCiCryPMQt
RhMfuMk4+gnvNUA5PksXuSTu/iJy6TrBhPpo39FAiHupy0X/njB+uhLYHERjuw6+
uDVUMGP/FOnBIaZMgOxb7ttRV2wLC4SPJ/OK/ZhlCjXZLdnfSP5UMXDuUhFAl6ee
fUNBj7Wy1hVC6VhGzXYQ/KatF/b3cHvdPHpEs7GA9DI7WOP0sHczi3sZcUEz1Je/
HtV1rL0hLcUYxnrQUqSr0J4JE5vFPhVkHbFAbVnZ0fE5MOjUD1H9XS9X9+VjSb7h
owvCaOxApNWme7u9u8YoxwjnqUg/z/+JnoK1BxK3egry7eqEfM53rhupELMAJbtP
WLk7r3L67Gsoy4WmFjQ=
-----END CERTIFICATE-----

View File

@ -1164,7 +1164,7 @@ node 'controller00.hpuswest.ic.openstack.org' {
nova_admin_password => hiera('nova_admin_password'), nova_admin_password => hiera('nova_admin_password'),
keystone_admin_token => hiera('keystone_admin_token'), keystone_admin_token => hiera('keystone_admin_token'),
ssl_key_file_contents => hiera('ssl_key_file_contents'), ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('hpuswest_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
br_name => 'br-vlan25', br_name => 'br-vlan25',
controller_management_address => '10.10.16.146', controller_management_address => '10.10.16.146',
controller_public_address => $::fqdn, controller_public_address => $::fqdn,
@ -1181,7 +1181,7 @@ node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
nova_rabbit_password => hiera('nova_rabbit_password'), nova_rabbit_password => hiera('nova_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'), neutron_rabbit_password => hiera('neutron_rabbit_password'),
neutron_admin_password => hiera('neutron_admin_password'), neutron_admin_password => hiera('neutron_admin_password'),
ssl_cert_file_contents => hiera('hpuswest_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
br_name => 'br-vlan25', br_name => 'br-vlan25',
controller_management_address => '10.10.16.146', controller_management_address => '10.10.16.146',
controller_public_address => 'controller00.hpuswest.ic.openstack.org', controller_public_address => 'controller00.hpuswest.ic.openstack.org',