opendev/system-config
Code Issues Proposed changes

Merge "Add Infra Cloud controller node"

Browse Source
This commit is contained in:
Jenkins 2016-02-09 00:20:17 +00:00 committed by Gerrit Code Review
commit 9313e79635
2 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/site.pp
View File

@ -1141,4 +1141,40 @@ node /.*wheel-mirror-.*\.openstack\.org/ {
}
}
# Node-OS: trusty
node 'controller00.hpuswest.ic.openstack.org' {
$group = 'infracloud'
class { '::openstack_project::server':
iptables_public_tcp_ports => [5000,5672,8774,9292,9696,35357], # keystone,rabbit,nova,glance,neutron,keystone
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
}
class { '::openstack_project::infracloud::controller':
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_chain_file_contents => hiera('ssl_chain_file_contents'),
keystone_ssl_key_file_contents => hiera('keystone_ssl_key_file_contents'),
keystone_ssl_cert_file_contents => hiera('keystone_ssl_cert_file_contents'),
glance_ssl_key_file_contents => hiera('glance_ssl_key_file_contents'),
glance_ssl_cert_file_contents => hiera('glance_ssl_cert_file_contents'),
neutron_ssl_key_file_contents => hiera('neutron_ssl_key_file_contents'),
neutron_ssl_cert_file_contents => hiera('neutron_ssl_cert_file_contents'),
nova_ssl_key_file_contents => hiera('nova_ssl_key_file_contents'),
nova_ssl_cert_file_contents => hiera('nova_ssl_cert_file_contents'),
br_name => 'br-vlan25',
controller_management_address => '10.10.16.146',
controller_public_address => $::fqdn,
}
}
# vim:sw=2:ts=2:expandtab:textwidth=79

53
modules/openstack_project/manifests/infracloud/controller.pp Normal file
View File

@ -0,0 +1,53 @@
class openstack_project::infracloud::controller (
$neutron_rabbit_password,
$nova_rabbit_password,
$root_mysql_password,
$keystone_mysql_password,
$glance_mysql_password,
$neutron_mysql_password,
$nova_mysql_password,
$glance_admin_password,
$keystone_admin_password,
$neutron_admin_password,
$nova_admin_password,
$keystone_admin_token,
$ssl_chain_file_contents,
$keystone_ssl_key_file_contents,
$keystone_ssl_cert_file_contents,
$neutron_ssl_key_file_contents,
$neutron_ssl_cert_file_contents,
$glance_ssl_key_file_contents,
$glance_ssl_cert_file_contents,
$nova_ssl_key_file_contents,
$nova_ssl_cert_file_contents,
$br_name,
$controller_management_address,
$controller_public_address = $::fqdn,
) {
class { '::infracloud::controller':
neutron_rabbit_password => $neutron_rabbit_password,
nova_rabbit_password => $nova_rabbit_password,
root_mysql_password => $root_mysql_password,
keystone_mysql_password => $keystone_mysql_password,
glance_mysql_password => $glance_mysql_password,
neutron_mysql_password => $neutron_mysql_password,
nova_mysql_password => $nova_mysql_password,
keystone_admin_password => $keystone_admin_password,
glance_admin_password => $glance_admin_password,
neutron_admin_password => $neutron_admin_password,
nova_admin_password => $nova_admin_password,
keystone_admin_token => $keystone_admin_token,
ssl_chain_file_contents => $ssl_chain_file_contents,
keystone_ssl_key_file_contents => $keystone_ssl_key_file_contents,
keystone_ssl_cert_file_contents => $keystone_ssl_cert_file_contents,
glance_ssl_key_file_contents => $neutron_ssl_key_file_contents,
glance_ssl_cert_file_contents => $neutron_ssl_cert_file_contents,
neutron_ssl_key_file_contents => $glance_ssl_key_file_contents,
neutron_ssl_cert_file_contents => $glance_ssl_cert_file_contents,
nova_ssl_key_file_contents => $nova_ssl_key_file_contents,
nova_ssl_cert_file_contents => $nova_ssl_cert_file_contents,
br_name => $br_name,
controller_management_address => $controller_management_address,
controller_public_address => $controller_public_address,
}
}