From ba66290b7e02509698e0626ce203203931784ae8 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Mota Date: Tue, 23 Aug 2016 15:49:39 +0200 Subject: [PATCH] Add ssl_key_file_contents to compute nodes It needed to be added, because vms were not booting with an error on that key being absent. Change-Id: I26e7f6a4b8226787bf76f9fdb8a2b2ccc8f2cbda --- manifests/site.pp | 1 + modules/openstack_project/manifests/infracloud/compute.pp | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index e13812e119..f3973c56bc 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1308,6 +1308,7 @@ node /^compute\d{3}\.vanilla\.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_key_file_contents => hiera('ssl_key_file_contents'), ssl_cert_file_contents => hiera('infracloud_vanilla_ssl_cert_file_contents'), br_name => 'br-vlan2551', controller_public_address => 'controller00.vanilla.ic.openstack.org', diff --git a/modules/openstack_project/manifests/infracloud/compute.pp b/modules/openstack_project/manifests/infracloud/compute.pp index f42f4cbf45..7ad05202ed 100644 --- a/modules/openstack_project/manifests/infracloud/compute.pp +++ b/modules/openstack_project/manifests/infracloud/compute.pp @@ -2,6 +2,7 @@ class openstack_project::infracloud::compute ( $nova_rabbit_password, $neutron_rabbit_password, $neutron_admin_password, + $ssl_key_file_contents, $ssl_cert_file_contents, $br_name, $controller_public_address, @@ -10,14 +11,9 @@ 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_key_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents, br_name => $br_name, controller_public_address => $controller_public_address, } - - realize ( - User::Virtual::Localuser['colleen'], - User::Virtual::Localuser['rcarrillocruz'], - ) - }