opendev/system-config
Code Issues Proposed changes

Merge "Use SSL for rabbitmq"

Browse Source
This commit is contained in:
Jenkins 2016-02-25 20:54:41 +00:00 committed by Gerrit Code Review
commit 1831c7a7db
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/site.pp
View File

@ -1162,7 +1162,7 @@ node /.*wheel-mirror-.*\.openstack\.org/ {
node 'controller00.hpuswest.ic.openstack.org' { node 'controller00.hpuswest.ic.openstack.org' {
$group = 'infracloud' $group = 'infracloud'
class { '::openstack_project::server': class { '::openstack_project::server':
iptables_public_tcp_ports => [5000,5672,8774,9292,9696,35357], # keystone,rabbit,nova,glance,neutron,keystone iptables_public_tcp_ports => [5000,5671,8774,9292,9696,35357], # keystone,rabbit,nova,glance,neutron,keystone
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
enable_unbound => false, enable_unbound => false,
} }
@ -1183,7 +1183,6 @@ node 'controller00.hpuswest.ic.openstack.org' {
ssl_key_file_contents => hiera('ssl_key_file_contents'), ssl_key_file_contents => hiera('ssl_key_file_contents'),
ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
br_name => 'br-vlan25', br_name => 'br-vlan25',
controller_management_address => '10.10.16.146',
controller_public_address => $::fqdn, controller_public_address => $::fqdn,
openstackci_password => hiera('openstackci_infracloud_password'), openstackci_password => hiera('openstackci_infracloud_password'),
openstackjenkins_password => hiera('openstackjenkins_infracloud_password'), openstackjenkins_password => hiera('openstackjenkins_infracloud_password'),
@ -1202,7 +1201,6 @@ node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
neutron_admin_password => hiera('neutron_admin_password'), neutron_admin_password => hiera('neutron_admin_password'),
ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'), ssl_cert_file_contents => hiera('infracloud_hpuswest_ssl_cert_file_contents'),
br_name => 'br-vlan25', br_name => 'br-vlan25',
controller_management_address => '10.10.16.146',
controller_public_address => 'controller00.hpuswest.ic.openstack.org', controller_public_address => 'controller00.hpuswest.ic.openstack.org',
} }
} }

2
modules/openstack_project/manifests/infracloud/compute.pp
View File

@ -4,7 +4,6 @@ class openstack_project::infracloud::compute (
$neutron_admin_password, $neutron_admin_password,
$ssl_cert_file_contents, $ssl_cert_file_contents,
$br_name, $br_name,
$controller_management_address,
$controller_public_address, $controller_public_address,
) { ) {
class { '::infracloud::compute': class { '::infracloud::compute':
@ -13,7 +12,6 @@ class openstack_project::infracloud::compute (
neutron_admin_password => $neutron_admin_password, neutron_admin_password => $neutron_admin_password,
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
br_name => $br_name, br_name => $br_name,
controller_management_address => $controller_management_address,
controller_public_address => $controller_public_address, controller_public_address => $controller_public_address,
} }
} }

2
modules/openstack_project/manifests/infracloud/controller.pp
View File

@ -15,7 +15,6 @@ class openstack_project::infracloud::controller (
$ssl_key_file_contents, $ssl_key_file_contents,
$ssl_cert_file_contents, $ssl_cert_file_contents,
$br_name, $br_name,
$controller_management_address,
$controller_public_address = $::fqdn, $controller_public_address = $::fqdn,
$openstackci_password, $openstackci_password,
$openstackci_email = 'infra-root@openstack.org', $openstackci_email = 'infra-root@openstack.org',
@ -39,7 +38,6 @@ class openstack_project::infracloud::controller (
ssl_key_file_contents => $ssl_key_file_contents, ssl_key_file_contents => $ssl_key_file_contents,
ssl_cert_file_contents => $ssl_cert_file_contents, ssl_cert_file_contents => $ssl_cert_file_contents,
br_name => $br_name, br_name => $br_name,
controller_management_address => $controller_management_address,
controller_public_address => $controller_public_address, controller_public_address => $controller_public_address,
} }