From f20a9760482c2c575d31b990f73b9b92c86f280d Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Mon, 12 Sep 2016 14:19:07 +0200 Subject: [PATCH] Remove dual region handling on infracloud manifests We no longer split physically two different clouds, they are both located on the same location and VLAN. Therefore, one inventory and no more region logic. Change-Id: Id6ed4e50da60f6558fe204ae638a164111fe9a0d --- hiera/group/infracloud.yaml | 3 +-- manifests/site.pp | 3 +-- modules/openstack_project/manifests/infracloud/baremetal.pp | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hiera/group/infracloud.yaml b/hiera/group/infracloud.yaml index 51fdc3b172..92ace2bd05 100644 --- a/hiera/group/infracloud.yaml +++ b/hiera/group/infracloud.yaml @@ -1,5 +1,5 @@ --- -ironic_inventory_vanilla: +ironic_inventory: baremetal00.vanilla.ic.openstack.org: driver: agent_ipmitool driver_info: @@ -961,7 +961,6 @@ ironic_inventory_vanilla: rack: b04 ilo_mac: 78:e7:d1:23:99:ba uuid: 476b4113-6378-470f-834d-181017b8f1a8 -ironic_inventory_chocolate: controller00.chocolate.ic.openstack.org: ipv4_address: 15.184.64.100 provisioning_ipv4_address: 10.10.16.100 diff --git a/manifests/site.pp b/manifests/site.pp index 328e85c74e..7f09eab142 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1377,10 +1377,9 @@ node /^baremetal\d{2}\.vanilla\.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_vanilla', {}), + ironic_inventory => hiera('ironic_inventory', {}), ironic_db_password => hiera('ironic_db_password'), mysql_password => hiera('bifrost_mysql_password'), - region => 'vanilla', ipmi_passwords => hiera('ipmi_west_passwords'), ssh_private_key => hiera('bifrost_vanilla_ssh_private_key'), ssh_public_key => hiera('bifrost_vanilla_ssh_public_key'), diff --git a/modules/openstack_project/manifests/infracloud/baremetal.pp b/modules/openstack_project/manifests/infracloud/baremetal.pp index 7a75b08b43..219b7ff343 100644 --- a/modules/openstack_project/manifests/infracloud/baremetal.pp +++ b/modules/openstack_project/manifests/infracloud/baremetal.pp @@ -5,7 +5,6 @@ class openstack_project::infracloud::baremetal ( $ironic_db_password, $ipmi_passwords, $mysql_password, - $region, $ssh_private_key, $ssh_public_key, $vlan, @@ -15,7 +14,6 @@ class openstack_project::infracloud::baremetal ( ironic_inventory => $ironic_inventory, ironic_db_password => $ironic_db_password, mysql_password => $mysql_password, - region => $region, ipmi_passwords => $ipmi_passwords, ssh_private_key => $ssh_private_key, ssh_public_key => $ssh_public_key,