puppet: Make zulip::base include zulip::apt_repository.

There was likely more dependency complexity prior to 97766102df, but
there is now no reason to require that consumers explicitly include
zulip::apt_repository.

docs/production/deployment.md

@@ -65,7 +65,7 @@ can do the following after unpacking a Zulip production release
 tarball:
 
 ```
-env PUPPET_CLASSES=zulip::base,zulip::apt_repository,zulip::redis ./scripts/setup/install
+env PUPPET_CLASSES=zulip::base,zulip::redis ./scripts/setup/install
 ```
 
 You can see most likely manifests you might want to choose in the list

puppet/zulip/manifests/apt_repository.pp

@@ -1,4 +1,3 @@
-# This depends on zulip::base having already been evaluated
 class zulip::apt_repository {
   $setup_apt_repo_file = "${::zulip_scripts_path}/lib/setup-apt-repo"
   exec{'setup_apt_repo':

puppet/zulip/manifests/base.pp

@@ -1,5 +1,16 @@
 class zulip::base {
   include zulip::common
+  case $::osfamily {
+    'debian': {
+      include zulip::apt_repository
+    }
+    'redhat': {
+      include zulip::yum_repository
+    }
+    default: {
+      fail('osfamily not supported')
+    }
+  }
   case $::osfamily {
     'debian': {
       $release_name = $::operatingsystemrelease ? {

puppet/zulip/manifests/dockervoyager.pp

@@ -4,8 +4,6 @@
 # Through this split of services, it is easier to scale the services to the needs.
 class zulip::dockervoyager {
   include zulip::base
-  # zulip::apt_repository must come after zulip::base
-  include zulip::apt_repository
   include zulip::app_frontend
   include zulip::supervisor
   include zulip::process_fts_updates

puppet/zulip/manifests/postgres_appdb_base.pp

@@ -6,7 +6,6 @@ class zulip::postgres_appdb_base {
 
   case $::osfamily {
     'debian': {
-      include zulip::apt_repository
       $postgresql = "postgresql-${zulip::base::postgres_version}"
       $postgres_sharedir = "/usr/share/postgresql/${zulip::base::postgres_version}"
       $postgres_confdirs = [
@@ -23,7 +22,6 @@ class zulip::postgres_appdb_base {
       $postgres_dict_affix = '/var/cache/postgresql/dicts/en_us.affix'
     }
     'redhat': {
-      include zulip::yum_repository
       $postgresql = "postgresql${zulip::base::postgres_version}"
       $postgres_sharedir = "/usr/pgsql-${zulip::base::postgres_version}/share"
       $postgres_confdirs = [

puppet/zulip/manifests/voyager.pp

@@ -3,25 +3,13 @@
 # different components of a Zulip installation on different servers by
 # using the modules below on different machines (the module list is
 # stored in `puppet_classes` in /etc/zulip/zulip.conf).  In general,
-# every machine should have `zulip::base` and `zulip::apt_repository`
-# included, but the various service modules can be arranged on
-# different machines or the same machine as desired (corresponding
-# configuration in /etc/zulip/settings.py for how to find the various
-# services is also required to make this work).
+# every machine should have `zulip::base` included, but the various
+# service modules can be arranged on different machines or the same
+# machine as desired (corresponding configuration in
+# /etc/zulip/settings.py for how to find the various services is also
+# required to make this work).
 class zulip::voyager {
   include zulip::base
-  # zulip::apt_repository must come after zulip::base
-  case $::osfamily {
-    'debian': {
-      include zulip::apt_repository
-    }
-    'redhat': {
-      include zulip::yum_repository
-    }
-    default: {
-      fail('osfamily not supported')
-    }
-  }
   include zulip::app_frontend
   include zulip::postgres_appdb_tuned
   include zulip::memcached

puppet/zulip/manifests/yum_repository.pp

@@ -1,4 +1,3 @@
-# This depends on zulip::base having already been evaluated
 class zulip::yum_repository {
   $setup_yum_repo_file = "${::zulip_scripts_path}/lib/setup-yum-repo"
   exec{'setup_yum_repo':

puppet/zulip_ops/manifests/base.pp

@@ -1,6 +1,5 @@
 class zulip_ops::base {
   include zulip::base
-  include zulip::apt_repository
   include zulip_ops::munin_node
 
   $org_base_packages = [# Management for our systems

tools/setup/install-aws-server

@@ -11,7 +11,7 @@ if [ -z "$SERVER" ] || [ -z "$ROLES" ]; then
     echo
     echo " * server is the local part of the hostname (e.g. postgres0)"
     echo " * roles is a list of puppet rules to be passed to scripts/lib/install"
-    echo "   E.g. 'zulip::base,zulip::apt_repository,zulip::postgres_common'"
+    echo "   E.g. 'zulip::base,zulip::postgres_common'"
     echo " * branch is used to override the default branch to install from."
     echo
     echo "Reads configuration from $HOME/.zulip-install-server.conf, which should look like:"