summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYolanda Robla Mota <yroblamo@redhat.com>2016-08-25 12:45:03 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-01 07:27:02 +0000
commitf90180f8b08c0551d11958c1faf2d28379d6afba (patch)
treebcede077f011257ec553aab3d496666e8b1f7fcb
parentd3421e222d0b504f58c14d28cbe8aea65bd51a47 (diff)
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>
-rw-r--r--prototypes/puppet-infracloud/hiera/common.yaml3
-rw-r--r--prototypes/puppet-infracloud/manifests/site.pp4
2 files changed, 5 insertions, 2 deletions
diff --git a/prototypes/puppet-infracloud/hiera/common.yaml b/prototypes/puppet-infracloud/hiera/common.yaml
index 6c28f1972..7d6b44063 100644
--- a/prototypes/puppet-infracloud/hiera/common.yaml
+++ b/prototypes/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/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',
}