opendev/system-config
Code Issues Proposed changes

Merge "Start using br_infracloud as bridge name"

Browse Source
This commit is contained in:
Jenkins 2016-09-29 12:17:23 +00:00 committed by Gerrit Code Review
commit 5bd606fc9f
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hiera/group/infracloud.yaml
View File

@ -2900,3 +2900,4 @@ ironic_inventory:
name: compute094.chocolate.ic.openstack.org name: compute094.chocolate.ic.openstack.org
rabbitmq::package_gpg_key: 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc' rabbitmq::package_gpg_key: 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc'
rabbitmq::repo::apt::key: '0A9AF2115F4687BD29803A206B73A36E6026DFCA' rabbitmq::repo::apt::key: '0A9AF2115F4687BD29803A206B73A36E6026DFCA'
bridge_name: br_infracloud

5
manifests/site.pp
View File

@ -1325,7 +1325,7 @@ node 'controller00.vanilla.ic.openstack.org' {
keystone_admin_token => hiera('keystone_admin_token'), keystone_admin_token => hiera('keystone_admin_token'),
ssl_key_file_contents => hiera('ssl_key_file_contents'), ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_vanilla_ssl_cert_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, controller_public_address => $::fqdn,
openstackci_password => hiera('openstackci_infracloud_password'), openstackci_password => hiera('openstackci_infracloud_password'),
openstackjenkins_password => hiera('openstackjenkins_infracloud_password'), openstackjenkins_password => hiera('openstackjenkins_infracloud_password'),
@ -1352,7 +1352,7 @@ node /^compute\d{3}\.vanilla\.ic\.openstack\.org$/ {
neutron_admin_password => hiera('neutron_admin_password'), neutron_admin_password => hiera('neutron_admin_password'),
ssl_key_file_contents => hiera('ssl_key_file_contents'), ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_vanilla_ssl_cert_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', controller_public_address => 'controller00.vanilla.ic.openstack.org',
} }
} }
@ -1434,6 +1434,7 @@ node /^baremetal\d{2}\.vanilla\.ic\.openstack\.org$/ {
ipmi_passwords => hiera('ipmi_passwords'), ipmi_passwords => hiera('ipmi_passwords'),
ssh_private_key => hiera('bifrost_vanilla_ssh_private_key'), ssh_private_key => hiera('bifrost_vanilla_ssh_private_key'),
ssh_public_key => hiera('bifrost_vanilla_ssh_public_key'), ssh_public_key => hiera('bifrost_vanilla_ssh_public_key'),
bridge_name => hiera('bridge_name'),
vlan => 2551, vlan => 2551,
gateway_ip => '15.184.64.1', gateway_ip => '15.184.64.1',
} }

2
modules/openstack_project/manifests/infracloud/baremetal.pp
View File

@ -7,10 +7,12 @@ class openstack_project::infracloud::baremetal (
$mysql_password, $mysql_password,
$ssh_private_key, $ssh_private_key,
$ssh_public_key, $ssh_public_key,
$bridge_name,
$vlan, $vlan,
$gateway_ip, $gateway_ip,
) { ) {
class { '::infracloud::bifrost': class { '::infracloud::bifrost':
bridge_name => $bridge_name,
ironic_inventory => $ironic_inventory, ironic_inventory => $ironic_inventory,
ironic_db_password => $ironic_db_password, ironic_db_password => $ironic_db_password,
mysql_password => $mysql_password, mysql_password => $mysql_password,