opendev/system-config
Code Issues Proposed changes

Merge "Don't purge apt sources on infracloud"

Browse Source
This commit is contained in:
Jenkins 2016-02-25 21:56:15 +00:00 committed by Gerrit Code Review
commit 98c837faf4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -1165,6 +1165,7 @@ node 'controller00.hpuswest.ic.openstack.org' {
iptables_public_tcp_ports => [5000,5671,8774,9292,9696,35357], # keystone,rabbit,nova,glance,neutron,keystone
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::controller':
keystone_rabbit_password => hiera('keystone_rabbit_password'),
@ -1194,6 +1195,7 @@ node /^compute\d{3}\.hpuswest\.ic\.openstack\.org$/ {
class { '::openstack_project::server':
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::compute':
nova_rabbit_password => hiera('nova_rabbit_password'),
@ -1214,6 +1216,7 @@ node /^baremetal\d{2}\.hpuswest\.ic\.openstack\.org$/ {
iptables_public_udp_ports => [67,69],
sysadmins => hiera('sysadmins', []),
enable_unbound => false,
purge_apt_sources => false,
}
class { '::openstack_project::infracloud::baremetal':

3
modules/openstack_project/manifests/server.pp
View File

@ -16,6 +16,7 @@ class openstack_project::server (
$puppetmaster_server = 'puppetmaster.openstack.org',
$manage_exim = true,
$pypi_index_url = 'https://pypi.python.org/simple',
$purge_apt_sources = true,
) {
class { 'openstack_project::template':
iptables_public_tcp_ports => $iptables_public_tcp_ports,
@ -32,6 +33,6 @@ class openstack_project::server (
manage_exim => $manage_exim,
sysadmins => $sysadmins,
pypi_index_url => $pypi_index_url,
purge_apt_sources => true,
purge_apt_sources => $purge_apt_sources,
}
}