opendev/system-config
Code Issues Proposed changes

Merge "Update git.o.o configs for better rolling reboots"

Browse Source
This commit is contained in:
Jenkins 2013-10-25 18:53:55 +00:00 committed by Gerrit Code Review
commit fcf52af995
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cgit/manifests/init.pp
View File

@ -34,7 +34,6 @@ class cgit(
'cgit', 'cgit',
'git-daemon', 'git-daemon',
'highlight', 'highlight',
'socat',
]: ]:
ensure => present, ensure => present,
} }
@ -171,6 +170,7 @@ class cgit(
service { 'git-daemon': service { 'git-daemon':
ensure => running, ensure => running,
enable => true,
subscribe => File['/etc/init.d/git-daemon'], subscribe => File['/etc/init.d/git-daemon'],
} }

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

@ -29,6 +29,10 @@ class openstack_project::git (
mode => 'enforcing' mode => 'enforcing'
} }
package { 'socat':
ensure => present,
}
class { 'haproxy': class { 'haproxy':
enable => true, enable => true,
global_options => { global_options => {
@ -39,7 +43,7 @@ class openstack_project::git (
'user' => 'haproxy', 'user' => 'haproxy',
'group' => 'haproxy', 'group' => 'haproxy',
'daemon' => '', 'daemon' => '',
'stats' => 'socket /var/lib/haproxy/stats' 'stats' => 'socket /var/lib/haproxy/stats user root group root mode 0600 level admin'
}, },
} }
# The three listen defines here are what the world will hit. # The three listen defines here are what the world will hit.