From f90180f8b08c0551d11958c1faf2d28379d6afba Mon Sep 17 00:00:00 2001 From: Yolanda Robla Mota Date: Thu, 25 Aug 2016 12:45:03 +0200 Subject: Set bridge name in hiera It is different from debian/centos, and will be different in baremetal as well, where vlans will be used. Add the ability to manage in hiera, so it can just be edited on the yaml file directly. Change-Id: I5f5ac3adec6606ca34b3c8ad86c99d8e3aee52d1 Signed-Off-By: Yolanda Robla --- prototypes/puppet-infracloud/manifests/site.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'prototypes/puppet-infracloud/manifests/site.pp') diff --git a/prototypes/puppet-infracloud/manifests/site.pp b/prototypes/puppet-infracloud/manifests/site.pp index e524918c6..5a6cc7bfc 100644 --- a/prototypes/puppet-infracloud/manifests/site.pp +++ b/prototypes/puppet-infracloud/manifests/site.pp @@ -30,7 +30,7 @@ node 'controller00.opnfvlocal' { keystone_admin_token => hiera('keystone_admin_token'), ssl_key_file_contents => hiera('ssl_key_file_contents'), ssl_cert_file_contents => hiera('ssl_cert_file_contents'), - br_name => 'br-eth0', + br_name => hiera('bridge_name'), controller_public_address => $::fqdn, neutron_subnet_cidr => '192.168.122.0/24', neutron_subnet_gateway => '192.168.122.1', @@ -55,7 +55,7 @@ node 'compute00.opnfvlocal' { neutron_admin_password => hiera('neutron_admin_password'), ssl_cert_file_contents => hiera('ssl_cert_file_contents'), ssl_key_file_contents => hiera('ssl_key_file_contents'), - br_name => 'br-eth0', + br_name => hiera('bridge_name'), controller_public_address => 'controller00.opnfvlocal', virt_type => 'qemu', } -- cgit 1.2.3-korg