Stop cloning more puppet modules

Previous review pointed out some additional modules we probably
aren't using any longer.

Remove the openafs::client section from openstack_project::server
because we're doing this with ansible now.

Depends-On: https://review.opendev.org/733890
Change-Id: Ib5104da9cf7d53b77191f48ec185f5d667d51944

manifests/site.pp

@@ -499,9 +499,7 @@ node /^kdc04\.open.*\.org$/ {
 node /^afsdb01\.open.*\.org$/ {
   $group = "afsdb"
 
-  class { 'openstack_project::server':
+  class { 'openstack_project::server': }
-    afs                       => true,
-  }
 
   include openstack_project::afsdb
   include openstack_project::afsrelease
@@ -511,9 +509,7 @@ node /^afsdb01\.open.*\.org$/ {
 node /^afsdb.*\.open.*\.org$/ {
   $group = "afsdb"
 
-  class { 'openstack_project::server':
+  class { 'openstack_project::server': }
-    afs                       => true,
-  }
 
   include openstack_project::afsdb
 }
@@ -522,9 +518,7 @@ node /^afsdb.*\.open.*\.org$/ {
 node /^afs.*\..*\.open.*\.org$/ {
   $group = "afs"
 
-  class { 'openstack_project::server':
+  class { 'openstack_project::server': }
-    afs                       => true,
-  }
 
   include openstack_project::afsfs
 }

modules.env

@@ -62,10 +62,10 @@ SOURCE_MODULES["https://github.com/voxpupuli/puppet-nodejs"]="v2.3.0"
 
 # Add modules that should be part of the openstack-infra integration test here
 # Please keep sorted
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ansible"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-askbot"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-asterisk"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-bup"]="origin/master"
+# Remove when we convert nb03 to ansible/docker
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-diskimage_builder"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elastic_recheck"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-elasticsearch"]="origin/master"
@@ -77,6 +77,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-haveged"]="origin/master
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-hound"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-httpd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jeepyb"]="origin/master"
+# Remove when we convert nb03 to ansible/docker
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-jenkins"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kerberos"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-kibana"]="origin/master"
@@ -91,9 +92,11 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-meetbot"]="origin/master
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mosquitto"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mqtt_statsd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-mysql_backup"]="origin/master"
+# Remove when we convert nb03 to ansible/docker
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-nodepool"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openafs"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstack_health"]="origin/master"
+# Remove when we convert nb03 to ansible/docker
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstackci"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-openstackid"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-pgsql_backup"]="origin/master"
@@ -105,7 +108,6 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-redis"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-refstack"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-reviewday"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-simpleproxy"]="origin/master"
-INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-snmpd"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ssh"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-ssl_cert_check"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-statusbot"]="origin/master"
@@ -127,6 +129,7 @@ INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-user"]="origin/master"
 # licensed
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-vcsrepo"]="origin/master"
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-zanata"]="origin/master"
+# Remove when we convert nb03 to ansible/docker
 INTEGRATION_MODULES["$OPENSTACK_GIT_ROOT/opendev/puppet-zuul"]="origin/master"
 
 if [[ "$PUPPET_INTEGRATION_TEST" -ne "1" ]]; then

modules/openstack_project/manifests/mirror_update.pp

@@ -13,9 +13,7 @@ class openstack_project::mirror_update (
   include ::gnupg
   include ::openstack_project::reprepro_mirror
 
-  class { 'openstack_project::server':
+  class { 'openstack_project::server': }
-    afs       => true,
-  }
 
   class { 'openstack_project::gem_mirror': }
 

modules/openstack_project/manifests/server.pp

@@ -4,8 +4,6 @@
 class openstack_project::server (
   $pin_puppet                = '3.',
   $ca_server                 = undef,
-  $afs                       = false,
-  $afs_cache_size            = 500000,
   $pypi_index_url            = 'https://pypi.python.org/simple',
 ) {
 
@@ -14,20 +12,4 @@ class openstack_project::server (
     include ::apt
   }
 
-  ###########################################################
-  # Process if ( $high_level_directive ) blocks
-
-  if $afs {
-    class { 'openafs::client':
-      cell         => 'openstack.org',
-      realm        => 'OPENSTACK.ORG',
-      admin_server => 'kdc.openstack.org',
-      cache_size   => $afs_cache_size,
-      kdcs         => [
-        'kdc03.openstack.org',
-        'kdc04.openstack.org',
-      ],
-    }
-  }
-
 }

zuul.d/puppet.yaml

@@ -9,7 +9,6 @@
     required-projects:
       - opendev/system-config
       - opendev/ansible-role-puppet
-      - opendev/puppet-ansible
       - opendev/puppet-apparmor
       - opendev/puppet-askbot
       - opendev/puppet-asterisk
@@ -59,7 +58,6 @@
       - opendev/puppet-refstack
       - opendev/puppet-reviewday
       - opendev/puppet-simpleproxy
-      - opendev/puppet-snmpd
       - opendev/puppet-ssh
       - opendev/puppet-ssl_cert_check
       - opendev/puppet-statusbot
@@ -157,9 +155,7 @@
       - opendev/puppet-mosquitto
       - opendev/puppet-bup
       - opendev/puppet-pgsql_backup
-      - opendev/puppet-ansible
       - opendev/puppet-ssh
-      - opendev/puppet-snmpd
       - opendev/puppet-user
       - opendev/puppet-jeepyb
       - opendev/puppet-ptgbot
@@ -203,7 +199,6 @@
     required-projects:
       - opendev/ansible-role-puppet
       - openstack/logstash-filters
-      - opendev/puppet-ansible
       - opendev/puppet-askbot
       - opendev/puppet-asterisk
       - opendev/puppet-bandersnatch
@@ -248,7 +243,6 @@
       - opendev/puppet-refstack
       - opendev/puppet-reviewday
       - opendev/puppet-simpleproxy
-      - opendev/puppet-snmpd
       - opendev/puppet-ssh
       - opendev/puppet-ssl_cert_check
       - opendev/puppet-statusbot