rhizo_base: Add contains dependencies

Puppet treats included classes specially, and does not assume that
they are contained in their outside class for the sake of dependency
ordering. This means that any other resources requiring the base
non-distribution specific classes were actually not capturing the
ordering dependencies on resources defined in the distribution
specific class!
This commit is contained in:
Matt Johnson 2019-07-18 12:38:07 -05:00
parent a817c3be52
commit 3e220df8fe
5 changed files with 5 additions and 5 deletions

View file

@ -12,7 +12,7 @@
# #
class rhizo_base::apt { class rhizo_base::apt {
include "rhizo_base::apt::$operatingsystem" contain "rhizo_base::apt::$operatingsystem"
} }
class rhizo_base::apt::common { class rhizo_base::apt::common {

View file

@ -12,7 +12,7 @@
# #
class rhizo_base::fixes { class rhizo_base::fixes {
include "rhizo_base::fixes::$operatingsystem" contain "rhizo_base::fixes::$operatingsystem"
file { '/etc/tmux.conf': file { '/etc/tmux.conf':
ensure => present, ensure => present,

View file

@ -11,7 +11,7 @@
# Sample Usage: # Sample Usage:
# #
class rhizo_base::freeswitch { class rhizo_base::freeswitch {
include "rhizo_base::freeswitch::$operatingsystem" contain "rhizo_base::freeswitch::$operatingsystem"
} }
class rhizo_base::freeswitch::ubuntu inherits rhizo_base::freeswitch::common { class rhizo_base::freeswitch::ubuntu inherits rhizo_base::freeswitch::common {

View file

@ -11,7 +11,7 @@
# Sample Usage: # Sample Usage:
# #
class rhizo_base::packages { class rhizo_base::packages {
include "rhizo_base::packages::$operatingsystem" contain "rhizo_base::packages::$operatingsystem"
} }
class rhizo_base::packages::common { class rhizo_base::packages::common {

View file

@ -12,7 +12,7 @@
# #
class rhizo_base::postgresql { class rhizo_base::postgresql {
include "rhizo_base::postgresql::$operatingsystem" contain "rhizo_base::postgresql::$operatingsystem"
} }
class rhizo_base::postgresql::common { class rhizo_base::postgresql::common {