Change to using the webhook without mcollective

In order to complete the change I refactered the webhook into
its own set of profiles, one with mcollective and the other
without.
This commit is contained in:
Nick Walker 2015-10-16 10:53:16 -07:00
parent 6ff5658a2a
commit 1828e21623
5 changed files with 33 additions and 15 deletions

View File

@ -46,16 +46,18 @@ http://docs.puppetlabs.com/pe/latest/regenerate_certs_master.html
- http://doc.gitlab.com/ce/workflow/groups.html - http://doc.gitlab.com/ce/workflow/groups.html
6. Create a user called `r10k_api_user` and add them to the `puppet` group 6. Create a user called `r10k_api_user` and add them to the `puppet` group
- From the landing page, select groups
- Choose the puppet group
- In the left hand pane, select memembers
- Add the `r10k_api_user` with `master` permissions
7. Add your user to the `puppet` group as well 7. Add your user to the `puppet` group as well
7. Create a project called `control-repo` and set the Namespace to be the `puppet` group 7. Create a project called `control-repo` and set the Namespace to be the `puppet` group
- TODO: Change permissions on the group?
8. Logout of root and login as the `r10k_api_user` 8. Logout of root and login as the `r10k_api_user`
- Go to profile settings -> account ( https://<your_gitlab_server>/profile/account ) - Go to profile settings -> account ( https://<your_gitlab_server>/profile/account )
- Copy the api token - Copy the api token
- TODO: Change permissions for this user?
9. Clone this control repository to your laptop/workstation 9. Clone this control repository to your laptop/workstation
- `git clone https://github.com/npwalker/control-repo.git` - `git clone https://github.com/npwalker/control-repo.git`

View File

@ -13,19 +13,6 @@ class profile::puppetmaster {
notify => Service['pe-puppetserver'], notify => Service['pe-puppetserver'],
} }
##BEGIN - r10k webhook support
include r10k::mcollective
include r10k::webhook::config
class {'r10k::webhook':
user => 'root',
group => '0',
require => Class['r10k::webhook::config'],
notify => Service['mcollective'],
}
##END - r10k webhook support
#BEGIN - Generate an SSH key for r10k to connect to git #BEGIN - Generate an SSH key for r10k to connect to git
$r10k_ssh_key_file = '/root/.ssh/r10k_rsa' $r10k_ssh_key_file = '/root/.ssh/r10k_rsa'
exec { 'create r10k ssh key' : exec { 'create r10k ssh key' :

View File

@ -0,0 +1,15 @@
class profile::webhook_mcollective {
class { 'r10k::mcollective':
notify => Service['mcollective'],
}
include r10k::webhook::config
class {'r10k::webhook':
user => 'root',
group => '0',
require => Class['r10k::webhook::config'],
}
}

View File

@ -0,0 +1,13 @@
class profile::webhook_no_mcollective {
class {'r10k::webhook::config':
use_mcollective => false,
}
class {'r10k::webhook':
user => 'root',
group => '0',
require => Class['r10k::webhook::config'],
}
}

View File

@ -1,5 +1,6 @@
class role::all_in_one_pe { class role::all_in_one_pe {
include profile::webhook_no_mcollective
include profile::puppetmaster include profile::puppetmaster
} }