From 3e220df8fe48b01a02a38065df5a7131068e13bb Mon Sep 17 00:00:00 2001
From: Matt Johnson <matt9j@cs.washington.edu>
Date: Thu, 18 Jul 2019 12:38:07 -0500
Subject: [PATCH] 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!
---
 modules/rhizo_base/manifests/apt.pp        | 2 +-
 modules/rhizo_base/manifests/fixes.pp      | 2 +-
 modules/rhizo_base/manifests/freeswitch.pp | 2 +-
 modules/rhizo_base/manifests/packages.pp   | 2 +-
 modules/rhizo_base/manifests/postgresql.pp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index 24ffcb5..a94252f 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -12,7 +12,7 @@
 #
 
 class rhizo_base::apt {
-  include "rhizo_base::apt::$operatingsystem"
+  contain "rhizo_base::apt::$operatingsystem"
 }
 
 class rhizo_base::apt::common {
diff --git a/modules/rhizo_base/manifests/fixes.pp b/modules/rhizo_base/manifests/fixes.pp
index de3fddc..fcb3764 100644
--- a/modules/rhizo_base/manifests/fixes.pp
+++ b/modules/rhizo_base/manifests/fixes.pp
@@ -12,7 +12,7 @@
 #
 
 class rhizo_base::fixes {
-  include "rhizo_base::fixes::$operatingsystem"
+  contain "rhizo_base::fixes::$operatingsystem"
 
   file { '/etc/tmux.conf':
       ensure  => present,
diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp
index c0f5724..a1e38e6 100644
--- a/modules/rhizo_base/manifests/freeswitch.pp
+++ b/modules/rhizo_base/manifests/freeswitch.pp
@@ -11,7 +11,7 @@
 # Sample Usage:
 #
 class rhizo_base::freeswitch {
-  include "rhizo_base::freeswitch::$operatingsystem"
+  contain "rhizo_base::freeswitch::$operatingsystem"
 }
 
 class rhizo_base::freeswitch::ubuntu inherits rhizo_base::freeswitch::common {
diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index 786ca75..b053d9f 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -11,7 +11,7 @@
 # Sample Usage:
 #
 class rhizo_base::packages {
-  include "rhizo_base::packages::$operatingsystem"
+  contain "rhizo_base::packages::$operatingsystem"
 }
 
 class rhizo_base::packages::common {
diff --git a/modules/rhizo_base/manifests/postgresql.pp b/modules/rhizo_base/manifests/postgresql.pp
index 0216b11..0b90ba1 100644
--- a/modules/rhizo_base/manifests/postgresql.pp
+++ b/modules/rhizo_base/manifests/postgresql.pp
@@ -12,7 +12,7 @@
 #
 
 class rhizo_base::postgresql {
-  include "rhizo_base::postgresql::$operatingsystem"
+  contain "rhizo_base::postgresql::$operatingsystem"
 }
 
 class rhizo_base::postgresql::common {