opendev/system-config
Code Issues Proposed changes

Update InfraCloud SSL configuration

Browse Source 
Update the system-config manifest to support the simplifying changes
made in the puppet-infracloud module.

This patch will require updates to hiera. We need keys
hpuswest_ssl_cert_file_contents and ssl_key_file_contents added, and
hpuswest_ssl_cert_file_contents must be in the 'infracloud' hiera group
since it is shared to the compute nodes.

Change-Id: I39c70b1077e8b467e0a7e123a694d037ffc77f7a
Depends-On: Ibeea608e965e58c496a95b2f02a4bf6b13e15f0e
This commit is contained in:
Colleen Murphy 2016-02-11 20:15:07 -08:00
parent d78e3d66f5
commit 61ed3e5198
3 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/site.pp
View File

@ -1163,15 +1163,8 @@ node 'controller00.hpuswest.ic.openstack.org' {
neutron_admin_password => hiera('neutron_admin_password'),
nova_admin_password => hiera('nova_admin_password'),
keystone_admin_token => hiera('keystone_admin_token'),
ssl_chain_file_contents => hiera('ssl_chain_file_contents'),
keystone_ssl_key_file_contents => hiera('keystone_ssl_key_file_contents'),
keystone_ssl_cert_file_contents => hiera('keystone_ssl_cert_file_contents'),
glance_ssl_key_file_contents => hiera('glance_ssl_key_file_contents'),
glance_ssl_cert_file_contents => hiera('glance_ssl_cert_file_contents'),
neutron_ssl_key_file_contents => hiera('neutron_ssl_key_file_contents'),
neutron_ssl_cert_file_contents => hiera('neutron_ssl_cert_file_contents'),
nova_ssl_key_file_contents => hiera('nova_ssl_key_file_contents'),
nova_ssl_cert_file_contents => hiera('nova_ssl_cert_file_contents'),
ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('hpuswest_ssl_cert_file_contents'),
br_name => 'br-vlan25',
controller_management_address => '10.10.16.146',
controller_public_address => $::fqdn,
@ -1188,6 +1181,7 @@ node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
nova_rabbit_password => hiera('nova_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
neutron_admin_password => hiera('neutron_admin_password'),
ssl_cert_file_contents => hiera('hpuswest_ssl_cert_file_contents'),
br_name => 'br-vlan25',
controller_management_address => '10.10.16.146',
controller_public_address => 'controller00.hpuswest.ic.openstack.org',

2
modules/openstack_project/manifests/infracloud/compute.pp
View File

@ -2,6 +2,7 @@ class openstack_project::infracloud::compute (
$nova_rabbit_password,
$neutron_rabbit_password,
$neutron_admin_password,
$ssl_cert_file_contents,
$br_name,
$controller_management_address,
$controller_public_address,
@ -10,6 +11,7 @@ class openstack_project::infracloud::compute (
nova_rabbit_password => $nova_rabbit_password,
neutron_rabbit_password => $neutron_rabbit_password,
neutron_admin_password => $neutron_admin_password,
ssl_cert_file_contents => $ssl_cert_file_contents,
br_name => $br_name,
controller_management_address => $controller_management_address,
controller_public_address => $controller_public_address,

22
modules/openstack_project/manifests/infracloud/controller.pp
View File

@ -12,15 +12,8 @@ class openstack_project::infracloud::controller (
$neutron_admin_password,
$nova_admin_password,
$keystone_admin_token,
$ssl_chain_file_contents,
$keystone_ssl_key_file_contents,
$keystone_ssl_cert_file_contents,
$neutron_ssl_key_file_contents,
$neutron_ssl_cert_file_contents,
$glance_ssl_key_file_contents,
$glance_ssl_cert_file_contents,
$nova_ssl_key_file_contents,
$nova_ssl_cert_file_contents,
$ssl_key_file_contents,
$ssl_cert_file_contents,
$br_name,
$controller_management_address,
$controller_public_address = $::fqdn,
@ -39,15 +32,8 @@ class openstack_project::infracloud::controller (
neutron_admin_password => $neutron_admin_password,
nova_admin_password => $nova_admin_password,
keystone_admin_token => $keystone_admin_token,
ssl_chain_file_contents => $ssl_chain_file_contents,
keystone_ssl_key_file_contents => $keystone_ssl_key_file_contents,
keystone_ssl_cert_file_contents => $keystone_ssl_cert_file_contents,
glance_ssl_key_file_contents => $neutron_ssl_key_file_contents,
glance_ssl_cert_file_contents => $neutron_ssl_cert_file_contents,
neutron_ssl_key_file_contents => $glance_ssl_key_file_contents,
neutron_ssl_cert_file_contents => $glance_ssl_cert_file_contents,
nova_ssl_key_file_contents => $nova_ssl_key_file_contents,
nova_ssl_cert_file_contents => $nova_ssl_cert_file_contents,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_cert_file_contents => $ssl_cert_file_contents,
br_name => $br_name,
controller_management_address => $controller_management_address,
controller_public_address => $controller_public_address,