From 32af2d64dc6b9d2cab447256863505078491cd05 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 8 Jun 2016 16:09:08 -0400 Subject: [PATCH] Bring baremetal00.vanilla.ic.openstack.org online Now that we have access again to baremetal00.vanilla.ic.openstack.org we can enroll it again into puppet. Change-Id: Id15c8694fe5e23896dd5778997d12dd13169183e Depends-On: I9dfdd617fba45c0947bd3d4e853d85b83923018b Signed-off-by: Paul Belanger --- hiera/group/infracloud.yaml | 14 +++++++++----- manifests/site.pp | 6 ++++-- .../files/puppetmaster/infracloud | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hiera/group/infracloud.yaml b/hiera/group/infracloud.yaml index c27574001e..36e74b747b 100644 --- a/hiera/group/infracloud.yaml +++ b/hiera/group/infracloud.yaml @@ -1,13 +1,13 @@ --- -ironic_inventory_hpuswest: - baremetal00.hpuswest.ic.openstack.org: +ironic_inventory_vanilla: + baremetal00.vanilla.ic.openstack.org: driver: agent_ipmitool driver_info: power: - ipmi_address: 10.10.16.36 + ipmi_address: 10.12.83.46 ipmi_username: Administrator - ipv4_public_address: 15.184.52.2 - ipv4_address: 10.10.16.144 + ipv4_public_address: 15.184.224.4 + ipv4_address: 10.10.16.4 name: baremetal00.hpuswest.ic.openstack.org nics: - mac: 78:e7:d1:23:95:6d @@ -16,8 +16,12 @@ ironic_inventory_hpuswest: cpus: '24' disk_size: '1800' ram: '96676' + serial_number: use129cnm1 + rack: '12' + ilo_mac: 78:e7:d1:23:95:6a uuid: 0090edd1-d3b6-4b6b-b3e4-b2bb09665d7b disabled: true # currently deployed +ironic_inventory_hpuswest: baremetal01.hpuswest.ic.openstack.org: driver: agent_ipmitool driver_info: diff --git a/manifests/site.pp b/manifests/site.pp index 198baa3c22..00c1171439 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1417,7 +1417,7 @@ node /^compute\d{3}\.hpuseast\.ic\.openstack\.org$/ { # Node-OS: trusty # Upgrade-Modules -node /^baremetal\d{2}\.hpuswest\.ic\.openstack\.org$/ { +node /^baremetal\d{2}\.vanilla\.ic\.openstack\.org$/ { $group = 'infracloud' class { '::openstack_project::server': iptables_public_udp_ports => [67,69], @@ -1427,10 +1427,12 @@ node /^baremetal\d{2}\.hpuswest\.ic\.openstack\.org$/ { } class { '::openstack_project::infracloud::baremetal': + # NOTE(pabelanger): hiera should be updated to reflect our new region + # names. ironic_inventory => hiera('ironic_inventory_hpuswest', {}), ironic_db_password => hiera('ironic_db_password'), mysql_password => hiera('bifrost_mysql_password'), - region => 'hpuswest', + region => 'vanilla', ipmi_passwords => hiera('ipmi_west_passwords'), ssh_private_key => hiera('bifrost_hpuswest_ssh_private_key'), ssh_public_key => hiera('bifrost_hpuswest_ssh_public_key'), diff --git a/modules/openstack_project/files/puppetmaster/infracloud b/modules/openstack_project/files/puppetmaster/infracloud index 440a4959c6..ac58ea7b70 100644 --- a/modules/openstack_project/files/puppetmaster/infracloud +++ b/modules/openstack_project/files/puppetmaster/infracloud @@ -1,4 +1,4 @@ [disabled:children] -infracloud [infracloud] +baremetal00.vanilla.ic.openstack.org