opendev/system-config
Code Issues Proposed changes

Merge "Bring baremetal00.vanilla.ic.openstack.org online"

Browse Source
This commit is contained in:
Jenkins 2016-06-13 23:09:14 +00:00 committed by Gerrit Code Review
commit a8481587e0
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hiera/group/infracloud.yaml
View File

@ -1,13 +1,13 @@
--- ---
ironic_inventory_hpuswest: ironic_inventory_vanilla:
baremetal00.hpuswest.ic.openstack.org: baremetal00.vanilla.ic.openstack.org:
driver: agent_ipmitool driver: agent_ipmitool
driver_info: driver_info:
power: power:
ipmi_address: 10.10.16.36 ipmi_address: 10.12.83.46
ipmi_username: Administrator ipmi_username: Administrator
ipv4_public_address: 15.184.52.2 ipv4_public_address: 15.184.224.4
ipv4_address: 10.10.16.144 ipv4_address: 10.10.16.4
name: baremetal00.hpuswest.ic.openstack.org name: baremetal00.hpuswest.ic.openstack.org
nics: nics:
- mac: 78:e7:d1:23:95:6d - mac: 78:e7:d1:23:95:6d
@ -16,8 +16,12 @@ ironic_inventory_hpuswest:
cpus: '24' cpus: '24'
disk_size: '1800' disk_size: '1800'
ram: '96676' ram: '96676'
serial_number: use129cnm1
rack: '12'
ilo_mac: 78:e7:d1:23:95:6a
uuid: 0090edd1-d3b6-4b6b-b3e4-b2bb09665d7b uuid: 0090edd1-d3b6-4b6b-b3e4-b2bb09665d7b
disabled: true # currently deployed disabled: true # currently deployed
ironic_inventory_hpuswest:
baremetal01.hpuswest.ic.openstack.org: baremetal01.hpuswest.ic.openstack.org:
driver: agent_ipmitool driver: agent_ipmitool
driver_info: driver_info:

6
manifests/site.pp
View File

@ -1403,7 +1403,7 @@ node /^compute\d{3}\.hpuseast\.ic\.openstack\.org$/ {
# Node-OS: trusty # Node-OS: trusty
# Upgrade-Modules # Upgrade-Modules
node /^baremetal\d{2}\.hpuswest\.ic\.openstack\.org$/ { node /^baremetal\d{2}\.vanilla\.ic\.openstack\.org$/ {
$group = 'infracloud' $group = 'infracloud'
class { '::openstack_project::server': class { '::openstack_project::server':
iptables_public_udp_ports => [67,69], iptables_public_udp_ports => [67,69],
@ -1413,10 +1413,12 @@ node /^baremetal\d{2}\.hpuswest\.ic\.openstack\.org$/ {
} }
class { '::openstack_project::infracloud::baremetal': class { '::openstack_project::infracloud::baremetal':
# NOTE(pabelanger): hiera should be updated to reflect our new region
# names.
ironic_inventory => hiera('ironic_inventory_hpuswest', {}), ironic_inventory => hiera('ironic_inventory_hpuswest', {}),
ironic_db_password => hiera('ironic_db_password'), ironic_db_password => hiera('ironic_db_password'),
mysql_password => hiera('bifrost_mysql_password'), mysql_password => hiera('bifrost_mysql_password'),
region => 'hpuswest', region => 'vanilla',
ipmi_passwords => hiera('ipmi_west_passwords'), ipmi_passwords => hiera('ipmi_west_passwords'),
ssh_private_key => hiera('bifrost_hpuswest_ssh_private_key'), ssh_private_key => hiera('bifrost_hpuswest_ssh_private_key'),
ssh_public_key => hiera('bifrost_hpuswest_ssh_public_key'), ssh_public_key => hiera('bifrost_hpuswest_ssh_public_key'),

2
modules/openstack_project/files/puppetmaster/infracloud
View File

@ -1,4 +1,4 @@
[disabled:children] [disabled:children]
infracloud
[infracloud] [infracloud]
baremetal00.vanilla.ic.openstack.org