@@ -36,11 +36,9 @@ def cicsetting(present_or_absent='present')
3636 on master , 'puppet apply /tmp/config_code_id_command_script_disable.pp'
3737 reload_server
3838
39- on ( master , 'rm -rf /root/.ssh/gittest_rsa*' , :accept_all_exit_codes => true )
4039 on ( master , 'puppet resource user git ensure=absent' )
4140 on ( master , "rm -rf #{ git_repo_parentdir } " , :accept_all_exit_codes => true )
4241 on ( master , "rm -rf #{ git_local_repo } " , :accept_all_exit_codes => true )
43- on ( master , 'rm -rf /home/git/.ssh/authorized_keys' , :accept_all_exit_codes => true )
4442
4543 #remove code_* scripts.
4644 on ( master , 'rm -rf /opt/puppetlabs/server/apps/puppetserver/code-id-command_script.sh' )
@@ -53,11 +51,6 @@ def cicsetting(present_or_absent='present')
5351 on ( master , 'puppet resource file /etc/puppetlabs/code ensure=directory' )
5452end
5553
56- step 'SETUP: Generate a new ssh key for the root user account to use with the git server'
57- on ( master , 'rm -f /root/.ssh/gittest_rsa' )
58- on ( master , 'ssh-keygen -t rsa -V +1d -f /root/.ssh/gittest_rsa -N ""' )
59- gittest_key = on ( master , "awk '{print $2}' /root/.ssh/gittest_rsa.pub" ) . stdout . chomp
60-
6154step 'SETUP: Install and configure git server' do
6255 on ( master , 'puppet module install puppetlabs-git' )
6356 git_config = <<-GIT
@@ -77,31 +70,12 @@ def cicsetting(present_or_absent='present')
7770 require => User['git'],
7871 }
7972
80- ssh_authorized_key { 'root@#{ hostname } ' :
81- user => 'git',
82- ensure => present,
83- type => 'ssh-rsa',
84- key => '#{ gittest_key } ',
85- require => File['/home/git'],
86- }
87-
8873 class { 'git': }
8974 GIT
9075 create_remote_file ( master , '/tmp/git_setup.pp' , git_config )
9176 on master , puppet_apply ( '/tmp/git_setup.pp' )
9277end
9378
94- step 'SETUP: Write out ssh config...' do
95- ssh_config = <<-SSHCONFIG
96- Host #{ hostname } #{ fqdn }
97- User git
98- IdentityFile ~/.ssh/gittest_rsa
99- IdentitiesOnly yes
100- StrictHostKeyChecking no
101- SSHCONFIG
102- create_remote_file ( master , '/root/.ssh/config' , ssh_config )
103- end
104-
10579step 'SETUP: Initialize the git control repository' do
10680 on master , "chown git #{ git_repo_parentdir } "
10781 on master , "sudo -u git git init --bare #{ git_repo } " , :pty => true
@@ -116,13 +90,13 @@ class { 'git': }
11690 on master , "cd #{ git_local_repo } && touch .gitignore"
11791 on master , "cd #{ git_local_repo } && git add ."
11892 on master , "cd #{ git_local_repo } && git commit -m 'initial commit'"
119- on master , "cd #{ git_local_repo } && git remote add origin git@ #{ fqdn } : #{ git_repo } "
93+ on master , "cd #{ git_local_repo } && git remote add origin file:// #{ git_repo } "
12094 on master , "cd #{ git_local_repo } && git push origin master"
12195end
12296
12397step 'SETUP: Install and configure r10k, and perform the initial commit' do
12498 on master , "puppet config set server #{ fqdn } "
125- on master , '/opt/puppetlabs/puppet/bin/gem install r10k'
99+ on master , '/opt/puppetlabs/puppet/bin/gem install r10k --no-document '
126100 on master , "cd #{ git_local_repo } && git checkout -b production"
127101 r10k_yaml = <<-R10K
128102# The location to use for storing cached Git repos
@@ -133,7 +107,7 @@ class { 'git': }
133107 # This will clone the git repository and instantiate an environment per
134108 # branch in /etc/puppetlabs/code/environments
135109 :my-org:
136- remote: git@ #{ fqdn } : #{ git_repo }
110+ remote: file:// #{ git_repo }
137111 basedir: '/etc/puppetlabs/code/environments'
138112R10K
139113 on master , 'mkdir -p /etc/puppetlabs/r10k'
0 commit comments