From 56aae69202563e30fa1c1a2a6fdd9ff8c2328b05 Mon Sep 17 00:00:00 2001
From: Yolanda Robla Mota <yroblamo@redhat.com>
Date: Thu, 25 Aug 2016 12:45:03 +0200
Subject: [PATCH] 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 <yroblamo@redhat.com>
---
puppet-infracloud/hiera/common.yaml | 3 +++
puppet-infracloud/manifests/site.pp | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/puppet-infracloud/hiera/common.yaml b/puppet-infracloud/hiera/common.yaml
index 6c28f197..7d6b4406 100644
--- a/puppet-infracloud/hiera/common.yaml
+++ b/puppet-infracloud/hiera/common.yaml
@@ -75,3 +75,6 @@ hosts:
ip: 192.168.122.3
compute00.opnfvlocal:
ip: 192.168.122.4
+
+# br-eth0 for debian, br-ens3 for RHEL
+bridge_name: br-eth0
diff --git a/puppet-infracloud/manifests/site.pp b/puppet-infracloud/manifests/site.pp
index e524918c..5a6cc7bf 100644
--- a/puppet-infracloud/manifests/site.pp
+++ b/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',
}
--
2.16.6