openstack
/
fuel-library
Code Issues Proposed changes

Add updates support to puppet-pull 

Modify puppet-pull script to support
passing puppet modules and manifests
from the astute.yaml during update.

Closes-Bug: 1361600
Change-Id: I5649e0cde20daa428826add58eee27686bf351b5
This commit is contained in:
Dmitry Ilyin 2014-08-26 12:56:36 +04:00 committed by Vladimir Kuklin
parent b3237073cd
commit e85834ff8e
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/osnailyfacter/examples/site.pp
View File

@ -278,7 +278,8 @@ class os_common {
}
class { 'puppet::pull' :
master_ip => $::fuel_settings['master_ip'],
modules_source => $::fuel_settings['puppet_modules_source'],
manifests_source => $::fuel_settings['puppet_manifests_source'],
}
} # OS_COMMON ENDS

3
deployment/puppet/puppet/manifests/pull.pp
View File

@ -1,7 +1,8 @@
class puppet::pull (
$master_ip = '10.20.0.2',
$script = '/usr/local/bin/puppet-pull',
$template = 'puppet/puppet-pull.sh.erb',
$modules_source = 'rsync://10.20.0.2/puppet/modules',
$manifests_source = 'rsync://10.20.0.2/puppet/manifests',
) {
file { $script :

5
deployment/puppet/puppet/templates/puppet-pull.sh.erb
View File

@ -1,9 +1,8 @@
#!/bin/sh
master_ip="<%= @master_ip %>"
local_modules="/etc/puppet/modules"
local_manifests="/etc/puppet/manifests"
remote_modules="rsync://${master_ip}/puppet/modules"
remote_manifests="rsync://${master_ip}/puppet/manifests"
remote_modules="<%= @modules_source %>"
remote_manifests="<%= @manifests_source %>"
main_manifest="/etc/puppet/manifests/site.pp"
rsync -rvc --delete "${remote_modules}/" "${local_modules}/"