opendev/system-config
Code Issues Proposed changes

Add ssl_key_file_contents to compute nodes

Browse Source 
It needed to be added, because vms were not booting
with an error on that key being absent.

Change-Id: I26e7f6a4b8226787bf76f9fdb8a2b2ccc8f2cbda
This commit is contained in:
Yolanda Robla Mota 2016-08-23 15:49:39 +02:00
parent 7741315212
commit ba66290b7e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/site.pp
View File

@ -1308,6 +1308,7 @@ node /^compute\d{3}\.vanilla\.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_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_vanilla_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('infracloud_vanilla_ssl_cert_file_contents'),
br_name => 'br-vlan2551', br_name => 'br-vlan2551',
controller_public_address => 'controller00.vanilla.ic.openstack.org', controller_public_address => 'controller00.vanilla.ic.openstack.org',

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

@ -2,6 +2,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_key_file_contents,
$ssl_cert_file_contents, $ssl_cert_file_contents,
$br_name, $br_name,
$controller_public_address, $controller_public_address,
@ -10,14 +11,9 @@ class openstack_project::infracloud::compute (
nova_rabbit_password => $nova_rabbit_password, nova_rabbit_password => $nova_rabbit_password,
neutron_rabbit_password => $neutron_rabbit_password, neutron_rabbit_password => $neutron_rabbit_password,
neutron_admin_password => $neutron_admin_password, neutron_admin_password => $neutron_admin_password,
ssl_key_file_contents => $ssl_key_file_contents,
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
br_name => $br_name, br_name => $br_name,
controller_public_address => $controller_public_address, controller_public_address => $controller_public_address,
} }
realize (
User::Virtual::Localuser['colleen'],
User::Virtual::Localuser['rcarrillocruz'],
)
} }