Remove hpuseast machines

They no longer exist, we now have vanilla/chocolate instead.

Change-Id: I8ff4603a7b74edcd1991e49c64c826d8d9b5b3eb
This commit is contained in:
Ricardo Carrillo Cruz 2016-09-13 12:50:44 +02:00
parent a21afdb0b0
commit 72f01455e0

View File

@ -1295,40 +1295,6 @@ node 'controller00.vanilla.ic.openstack.org' {
}
}
# Node-OS: trusty
node 'controller00.hpuseast.ic.openstack.org' {
$group = 'infracloud'
class { '::openstack_project::server':
iptables_public_tcp_ports => [80,5000,5671,8774,9292,9696,35357], # logs,keystone,rabbit,nova,glance,neutron,keystone
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
}
class { '::openstack_project::infracloud::controller':
keystone_rabbit_password => hiera('keystone_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
nova_rabbit_password => hiera('nova_rabbit_password'),
root_mysql_password => hiera('infracloud_mysql_password'),
keystone_mysql_password => hiera('keystone_mysql_password'),
glance_mysql_password => hiera('glance_mysql_password'),
neutron_mysql_password => hiera('neutron_mysql_password'),
nova_mysql_password => hiera('nova_mysql_password'),
keystone_admin_password => hiera('keystone_admin_password'),
glance_admin_password => hiera('glance_admin_password'),
neutron_admin_password => hiera('neutron_admin_password'),
nova_admin_password => hiera('nova_admin_password'),
keystone_admin_token => hiera('keystone_admin_token'),
ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_hpuseast_ssl_cert_file_contents'),
br_name => 'br-vlan1598',
controller_public_address => $::fqdn,
neutron_subnet_cidr => '15.126.48.0/24',
neutron_subnet_gateway => '15.126.48.1',
neutron_subnet_allocation_pools => [ 'start=15.126.48.30,end=15.126.48.254' ],
openstackci_password => hiera('openstackci_infracloud_password'),
openstackjenkins_password => hiera('openstackjenkins_infracloud_password'),
}
}
node /^compute\d{3}\.vanilla\.ic\.openstack\.org$/ {
$group = 'infracloud'
class { '::openstack_project::server':
@ -1347,22 +1313,6 @@ node /^compute\d{3}\.vanilla\.ic\.openstack\.org$/ {
}
}
node /^compute\d{3}\.hpuseast\.ic\.openstack\.org$/ {
$group = 'infracloud'
class { '::openstack_project::server':
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
}
class { '::openstack_project::infracloud::compute':
nova_rabbit_password => hiera('nova_rabbit_password'),
neutron_rabbit_password => hiera('neutron_rabbit_password'),
neutron_admin_password => hiera('neutron_admin_password'),
ssl_cert_file_contents => hiera('infracloud_hpuseast_ssl_cert_file_contents'),
br_name => 'br-vlan1598',
controller_public_address => 'controller00.hpuseast.ic.openstack.org',
}
}
# Node-OS: trusty
# Upgrade-Modules
node /^baremetal\d{2}\.vanilla\.ic\.openstack\.org$/ {