From 8bdddcb2c189be78f2b9d3d3af3a9bf0df262014 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Mota Date: Mon, 12 Sep 2016 12:35:42 +0200 Subject: [PATCH] Start using br_infracloud as bridge name Change-Id: I9a2bb48dbec64c0f4f1d9442129a08561c387819 Depends-On: I0790bab2fd63f525e8b9c8d47ee79ea63a72750a --- hiera/group/infracloud.yaml | 1 + manifests/site.pp | 5 +++-- modules/openstack_project/manifests/infracloud/baremetal.pp | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hiera/group/infracloud.yaml b/hiera/group/infracloud.yaml index 985b40e7c2..112007ed22 100644 --- a/hiera/group/infracloud.yaml +++ b/hiera/group/infracloud.yaml @@ -2915,3 +2915,4 @@ ironic_inventory: name: compute094.chocolate.ic.openstack.org rabbitmq::package_gpg_key: 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc' rabbitmq::repo::apt::key: '0A9AF2115F4687BD29803A206B73A36E6026DFCA' +bridge_name: br_infracloud diff --git a/manifests/site.pp b/manifests/site.pp index 678d13a2dd..f481cceeaa 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1307,7 +1307,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_vanilla_ssl_cert_file_contents'), - br_name => 'br-vlan2551', + br_name => hiera('bridge_name'), controller_public_address => $::fqdn, openstackci_password => hiera('openstackci_infracloud_password'), openstackjenkins_password => hiera('openstackjenkins_infracloud_password'), @@ -1334,7 +1334,7 @@ node /^compute\d{3}\.vanilla\.ic\.openstack\.org$/ { 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', + br_name => hiera('bridge_name'), controller_public_address => 'controller00.vanilla.ic.openstack.org', } } @@ -1359,6 +1359,7 @@ node /^baremetal\d{2}\.vanilla\.ic\.openstack\.org$/ { ipmi_passwords => hiera('ipmi_west_passwords'), ssh_private_key => hiera('bifrost_vanilla_ssh_private_key'), ssh_public_key => hiera('bifrost_vanilla_ssh_public_key'), + bridge_name => hiera('bridge_name'), vlan => 2551, gateway_ip => '15.184.64.1', } diff --git a/modules/openstack_project/manifests/infracloud/baremetal.pp b/modules/openstack_project/manifests/infracloud/baremetal.pp index 219b7ff343..9b0f8f0f01 100644 --- a/modules/openstack_project/manifests/infracloud/baremetal.pp +++ b/modules/openstack_project/manifests/infracloud/baremetal.pp @@ -7,10 +7,12 @@ class openstack_project::infracloud::baremetal ( $mysql_password, $ssh_private_key, $ssh_public_key, + $bridge_name, $vlan, $gateway_ip, ) { class { '::infracloud::bifrost': + bridge_name => $bridge_name, ironic_inventory => $ironic_inventory, ironic_db_password => $ironic_db_password, mysql_password => $mysql_password,