opendev/system-config
Code Issues Proposed changes

Merge "Break out openstack_project::server from static.o.o"

Browse Source
This commit is contained in:
Jenkins
2015-06-29 17:42:22 +00:00
committed by Gerrit Code Review
parent 68761c31e2 82e75b1884
commit 3ccfc189b2
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/site.pp
View File

@@ -482,9 +482,12 @@ node 'storyboard.openstack.org' {
# A machine to serve static content. # A machine to serve static content.
# Node-OS: precise # Node-OS: precise
node 'static.openstack.org' { node 'static.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::static': class { 'openstack_project::static':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
sysadmins => hiera('sysadmins', []),
swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/', swift_authurl => 'https://identity.api.rackspacecloud.com/v2.0/',
swift_user => 'infra-files-ro', swift_user => 'infra-files-ro',
swift_key => hiera('infra_files_ro_password', 'XXX'), swift_key => hiera('infra_files_ro_password', 'XXX'),

7
modules/openstack_project/manifests/static.pp
View File

@@ -1,7 +1,6 @@
# == Class: openstack_project::static # == Class: openstack_project::static
# #
class openstack_project::static ( class openstack_project::static (
$sysadmins = [],
$swift_authurl = '', $swift_authurl = '',
$swift_user = '', $swift_user = '',
$swift_key = '', $swift_key = '',
@@ -15,12 +14,6 @@ class openstack_project::static (
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [22, 80, 443],
sysadmins => $sysadmins,
}
class { 'project_config': class { 'project_config':
url => $project_config_repo, url => $project_config_repo,
} }