From 5eb9c3425e77a06038b13cc95006d9541bb4fce8 Mon Sep 17 00:00:00 2001
From: Ricardo Carrillo Cruz <ricardo.carrillo.cruz@gmail.com>
Date: Tue, 23 Aug 2016 10:45:46 +0200
Subject: [PATCH] Fix vlan on vanilla controller and compute machines
The VLAN is now 2551.
Change-Id: If0f8e22265111e3c59bd7a190f37bc103447405a
---
manifests/site.pp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index 965824bffe..43641f964e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1249,7 +1249,7 @@ node 'controller00.vanilla.ic.openstack.org' {
keystone_admin_token => hiera('keystone_admin_token'),
ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
- br_name => 'br-vlan25',
+ br_name => 'br-vlan2551',
controller_public_address => $::fqdn,
openstackci_password => hiera('openstackci_infracloud_password'),
openstackjenkins_password => hiera('openstackjenkins_infracloud_password'),
@@ -1309,7 +1309,7 @@ node /^compute\d{3}\.vanilla\.ic\.openstack\.org$/ {
neutron_rabbit_password => hiera('neutron_rabbit_password'),
neutron_admin_password => hiera('neutron_admin_password'),
ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
- br_name => 'br-vlan25',
+ br_name => 'br-vlan2551',
controller_public_address => 'controller00.vanilla.ic.openstack.org',
}
}