Debian Jessie to AFS mirrors

So project using debian-jessie DIB can benefit from our AFS infra.

Change-Id: I30206d6802120f5b89f58f1c1dc3548515fcef76
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

modules/openstack_project/files/reprepro/debian-mirror-gpg-key.asc

@@ -0,0 +1,140 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.5
+Comment: Hostname: keyserver.ubuntu.com
+
+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
+48wfXg==
+=larH
+-----END PGP PUBLIC KEY BLOCK-----

modules/openstack_project/manifests/mirror.pp

@@ -63,6 +63,17 @@ class openstack_project::mirror (
     ]
   }
 
+  # Create the symlink to debian
+  file { "${www_root}/debian":
+    ensure  => link,
+    target  => "${mirror_root}/debian",
+    owner   => root,
+    group   => root,
+    require => [
+      File["${www_root}"],
+    ]
+  }
+
   # Create the symlink to Debian OpenStack Packaging Team reprepro.
   file { "${www_root}/debian-openstack":
     ensure  => link,

modules/openstack_project/manifests/mirror_update.pp

@@ -9,6 +9,7 @@ class openstack_project::mirror_update (
   $centos_keytab = '',
   $epel_keytab = '',
 ) {
+  include ::gnupg
   include ::openstack_project::reprepro_mirror
 
   class { 'openstack_project::server':
@@ -112,6 +113,37 @@ class openstack_project::mirror_update (
     source  => 'puppet:///modules/openstack_project/reprepro/reprepro-mirror-update.sh',
   }
 
+  ### Debian mirror ###
+  ::openstack_project::reprepro { 'debian-reprepro-mirror':
+    confdir       => '/etc/reprepro/debian',
+    basedir       => '/afs/.openstack.org/mirror/debian',
+    distributions => 'openstack_project/reprepro/distributions.debian.erb',
+    updates_file  => 'puppet:///modules/openstack_project/reprepro/debuntu-updates',
+    releases      => ['jessie'],
+  }
+
+  cron { 'reprepro debian':
+    user        => $user,
+    hour        => '*/2',
+    minute      => '0',
+    command     => 'flock -n /var/run/reprepro/debian.lock reprepro-mirror-update /etc/reprepro/debian mirror.debian >>/var/log/reprepro/debian-mirror.log 2>&1',
+    environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
+    require     => [
+       File['/usr/local/bin/reprepro-mirror-update'],
+       File['/etc/afsadmin.keytab'],
+       File['/etc/reprepro.keytab'],
+       ::openstack_project::reprepro['debian-reprepro-mirror'],
+    ]
+  }
+
+  gnupg_key { 'Debian Archive':
+    ensure     => present,
+    key_id     => '7638d0442b90d010',
+    user       => 'root',
+    key_source => 'puppet:///modules/openstack_project/reprepro/debian-mirror-gpg-key.asc',
+    key_type   => 'public',
+  }
+
   ::openstack_project::reprepro { 'ubuntu-reprepro-mirror':
     confdir       => '/etc/reprepro/ubuntu',
     basedir       => '/afs/.openstack.org/mirror/ubuntu',
@@ -134,8 +166,6 @@ class openstack_project::mirror_update (
     ]
   }
 
-  include ::gnupg
-
   gnupg_key { 'Ubuntu Archive':
     ensure     => present,
     key_id     => '40976EAF437D05B5',
@@ -264,6 +294,4 @@ class openstack_project::mirror_update (
     key_type   => 'public',
     key_source => 'puppet:///modules/openstack_project/reprepro/ubuntu-cloud-archive-gpg-key.asc',
   }
-
-
 }