openstack/cookbook-openstack-object-storage
Code Issues Proposed changes

Merge "It seems git requires a name and email"

Browse Source
This commit is contained in:
Jenkins 2015-02-04 11:29:02 +00:00 committed by Gerrit Code Review
commit 98e9dc607e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
recipes/ring-repo.rb
View File

@ -24,6 +24,8 @@
platform_options = node['openstack']['object-storage']['platform'] platform_options = node['openstack']['object-storage']['platform']
ring_options = node['openstack']['object-storage']['ring'] ring_options = node['openstack']['object-storage']['ring']
git_config_email = "git config user.email 'chef@openstack.org'"
git_config_name = "git config user.name 'Chef'"
platform_options['git_packages'].each do |pkg| platform_options['git_packages'].each do |pkg|
package pkg do package pkg do
@ -41,7 +43,7 @@ end
execute 'create empty git repo' do execute 'create empty git repo' do
cwd '/tmp' cwd '/tmp'
umask 022 umask 022
command "mkdir $$; cd $$; git init; echo \"backups\" \> .gitignore; git add .gitignore; git commit -m 'initial commit' --author='chef <chef@openstack>'; git push file:///#{platform_options["git_dir"]}/rings master" command "mkdir $$; cd $$; git init; echo \"backups\" \> .gitignore; #{git_config_email} ; #{git_config_name} ; git add .gitignore; git commit -m 'initial commit' --author='chef <chef@openstack>'; git push file:///#{platform_options["git_dir"]}/rings master"
user 'swift' user 'swift'
action :nothing action :nothing
end end
@ -129,7 +131,7 @@ end
"min_part_hours=#{min_part_hours}, replicas=#{replicas}") "min_part_hours=#{min_part_hours}, replicas=#{replicas}")
execute "add #{ring_type}.builder" do execute "add #{ring_type}.builder" do
cwd '/etc/swift/ring-workspace/rings' cwd '/etc/swift/ring-workspace/rings'
command "git add #{ring_type}.builder && git commit -m 'initial ring builders' --author='chef <chef@openstack>'" command "git add #{ring_type}.builder && #{git_config_email} ; #{git_config_name} && git commit -m 'initial ring builders' --author='chef <chef@openstack>'"
user 'swift' user 'swift'
action :nothing action :nothing
end end