From 10c81e2b7b3d9bc67e262f30140558a0cbd9ddeb Mon Sep 17 00:00:00 2001 From: Gabriel M Schuyler Date: Thu, 10 Dec 2015 13:50:22 -0800 Subject: [PATCH] Add profile::base to all roles --- site/role/manifests/all_in_one_pe.pp | 2 ++ site/role/manifests/database_server.pp | 6 ++++-- site/role/manifests/example.pp | 3 +++ site/role/manifests/gitlab.pp | 3 +++ site/role/manifests/webserver.pp | 6 ++++-- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/site/role/manifests/all_in_one_pe.pp b/site/role/manifests/all_in_one_pe.pp index 6bc2eb3..f25f22f 100644 --- a/site/role/manifests/all_in_one_pe.pp +++ b/site/role/manifests/all_in_one_pe.pp @@ -3,6 +3,8 @@ class role::all_in_one_pe { $webhook_username = hiera('webhook_username', fqdn_rand_string(10, '', 'username')) $webhook_password = hiera('webhook_password', fqdn_rand_string(20, '', 'password')) + include profile::base + class { 'profile::puppetmaster' : webhook_username => $webhook_username, webhook_password => $webhook_password, diff --git a/site/role/manifests/database_server.pp b/site/role/manifests/database_server.pp index aacc912..70095c2 100644 --- a/site/role/manifests/database_server.pp +++ b/site/role/manifests/database_server.pp @@ -1,7 +1,9 @@ +# This role would be made of all the profiles that need to be included to make +# a database server work. + class role::database_server { - #This role would be made of all the profiles that need to be included to make a database server work - #All roles should include the base profile + # All roles should include the base profile include profile::base } diff --git a/site/role/manifests/example.pp b/site/role/manifests/example.pp index 2c1d2d7..e11643d 100644 --- a/site/role/manifests/example.pp +++ b/site/role/manifests/example.pp @@ -1,3 +1,6 @@ class role::example { + # All roles should include the base profile + include profile::base + } diff --git a/site/role/manifests/gitlab.pp b/site/role/manifests/gitlab.pp index 1f459d6..b588ed9 100644 --- a/site/role/manifests/gitlab.pp +++ b/site/role/manifests/gitlab.pp @@ -1,5 +1,8 @@ class role::gitlab { + # All roles should include the base profile + include profile::base + include profile::gitlab } diff --git a/site/role/manifests/webserver.pp b/site/role/manifests/webserver.pp index 314fa55..5ef48a1 100644 --- a/site/role/manifests/webserver.pp +++ b/site/role/manifests/webserver.pp @@ -1,7 +1,9 @@ +# This role would be made of all the profiles that need to be included to make +# a webserver work + class role::webserver { - #This role would be made of all the profiles that need to be included to make a webserver work - #All roles should include the base profile + # All roles should include the base profile include profile::base }