opendev/system-config
Code Issues Proposed changes

Move server outside git_backend class

Browse Source 
Change-Id: I00d3ce8970e0a0dacbca93fde918e406e99e1600
Story: 2000172
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html
This commit is contained in:
Yolanda Robla 2015-04-30 15:22:34 +02:00
parent 409692774a
commit ba9c487e6e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -392,10 +392,14 @@ node /^git(-fe\d+)?\.openstack\.org$/ {
node /^git\d+\.openstack\.org$/ { node /^git\d+\.openstack\.org$/ {
$group = "git-server" $group = "git-server"
include openstack_project include openstack_project
class { 'openstack_project::server':
iptables_public_tcp_ports => [4443, 8080, 29418],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::git_backend': class { 'openstack_project::git_backend':
project_config_repo => 'https://git.openstack.org/openstack-infra/project-config', project_config_repo => 'https://git.openstack.org/openstack-infra/project-config',
vhost_name => 'git.openstack.org', vhost_name => 'git.openstack.org',
sysadmins => hiera('sysadmins', []),
git_gerrit_ssh_key => hiera('gerrit_replication_ssh_rsa_pubkey_contents', 'XXX'), git_gerrit_ssh_key => hiera('gerrit_replication_ssh_rsa_pubkey_contents', 'XXX'),
ssl_cert_file_contents => hiera('git_ssl_cert_file_contents', 'XXX'), ssl_cert_file_contents => hiera('git_ssl_cert_file_contents', 'XXX'),
ssl_key_file_contents => hiera('git_ssl_key_file_contents', 'XXX'), ssl_key_file_contents => hiera('git_ssl_key_file_contents', 'XXX'),

6
modules/openstack_project/manifests/git_backend.pp
View File

@ -17,7 +17,6 @@
# == Class: openstack_project::git_backend # == Class: openstack_project::git_backend
class openstack_project::git_backend ( class openstack_project::git_backend (
$vhost_name = $::fqdn, $vhost_name = $::fqdn,
$sysadmins = [],
$git_gerrit_ssh_key = '', $git_gerrit_ssh_key = '',
$ssl_cert_file_contents = '', $ssl_cert_file_contents = '',
$ssl_key_file_contents = '', $ssl_key_file_contents = '',
@ -34,11 +33,6 @@ class openstack_project::git_backend (
url => $project_config_repo, url => $project_config_repo,
} }
class { 'openstack_project::server':
iptables_public_tcp_ports => [4443, 8080, 29418],
sysadmins => $sysadmins,
}
include jeepyb include jeepyb
include pip include pip