From ead7f3c706657bbfae37ff40c8f919fb57c8a841 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Thu, 31 Jan 2019 16:58:13 -0800 Subject: Rename site directory to site-modules Prior to this commit, we placed modules local to a users installation in the `site` directory. This was just a convention and the name `site` doesn't clearly convey what it is for. After this commit, we place modules local to a users installation in the `site-modules` directory. This makes it more clear to users that this is a directory that modules go i. When users start with bolt they won't even know what a control-repo is and renaming site to site-modules gives them a better idea of why they should put their modules with tasks in them. Also see: https://tickets.puppetlabs.com/browse/BOLT-1108 --- site-modules/profile/manifests/base.pp | 5 +++++ site-modules/profile/manifests/example.pp | 3 +++ site-modules/role/manifests/database_server.pp | 7 +++++++ site-modules/role/manifests/example.pp | 3 +++ site-modules/role/manifests/webserver.pp | 7 +++++++ 5 files changed, 25 insertions(+) create mode 100644 site-modules/profile/manifests/base.pp create mode 100644 site-modules/profile/manifests/example.pp create mode 100644 site-modules/role/manifests/database_server.pp create mode 100644 site-modules/role/manifests/example.pp create mode 100644 site-modules/role/manifests/webserver.pp (limited to 'site-modules') diff --git a/site-modules/profile/manifests/base.pp b/site-modules/profile/manifests/base.pp new file mode 100644 index 0000000..ae85e65 --- /dev/null +++ b/site-modules/profile/manifests/base.pp @@ -0,0 +1,5 @@ +class profile::base { + + #the base profile should include component modules that will be on all nodes + +} diff --git a/site-modules/profile/manifests/example.pp b/site-modules/profile/manifests/example.pp new file mode 100644 index 0000000..0b48c3a --- /dev/null +++ b/site-modules/profile/manifests/example.pp @@ -0,0 +1,3 @@ +class profile::example { + +} diff --git a/site-modules/role/manifests/database_server.pp b/site-modules/role/manifests/database_server.pp new file mode 100644 index 0000000..aacc912 --- /dev/null +++ b/site-modules/role/manifests/database_server.pp @@ -0,0 +1,7 @@ +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 + include profile::base + +} diff --git a/site-modules/role/manifests/example.pp b/site-modules/role/manifests/example.pp new file mode 100644 index 0000000..2c1d2d7 --- /dev/null +++ b/site-modules/role/manifests/example.pp @@ -0,0 +1,3 @@ +class role::example { + +} diff --git a/site-modules/role/manifests/webserver.pp b/site-modules/role/manifests/webserver.pp new file mode 100644 index 0000000..314fa55 --- /dev/null +++ b/site-modules/role/manifests/webserver.pp @@ -0,0 +1,7 @@ +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 + include profile::base + +} -- cgit v1.2.3