From 0eb17f39df8fcfa8d87cf2d3711a3a2f1ad8297c Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 22 Mar 2019 16:26:01 -0700 Subject: [PATCH] Explicitly set up mirror update crons under root user We were using $user as the user to setup the crons under which looked up the user fact for the user running puppet. This meant that we got root. When we upgraded to puppet 4 the fact is actually $::user, but there isn't really a good reason to make this variable. If we start running pupept under a different user we'll get multiple crons configured and it will be a mess. Explicitly set up the crons under the root user for clarity and simplicity. Change-Id: If7841bf95d252c1fd358bf329e6ea71f58e14a30 --- .../manifests/mirror_update.pp | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/openstack_project/manifests/mirror_update.pp b/modules/openstack_project/manifests/mirror_update.pp index 1b9306600d..350fb5af74 100644 --- a/modules/openstack_project/manifests/mirror_update.pp +++ b/modules/openstack_project/manifests/mirror_update.pp @@ -67,7 +67,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro debian': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'reprepro-debian'), command => 'flock -n /var/run/reprepro/debian.lock reprepro-mirror-update /etc/reprepro/debian mirror.debian >>/var/log/reprepro/debian-mirror.log 2>&1', @@ -100,7 +100,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro debian security': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'reprepro-debian-security'), command => 'flock -n /var/run/reprepro/debian-security.lock reprepro-mirror-update /etc/reprepro/debian-security mirror.debian-security >>/var/log/reprepro/debian-security-mirror.log 2>&1', @@ -130,7 +130,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro ubuntu': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'reprepro-ubuntu'), command => 'flock -n /var/run/reprepro/ubuntu.lock reprepro-mirror-update /etc/reprepro/ubuntu mirror.ubuntu >>/var/log/reprepro/ubuntu-mirror.log 2>&1', @@ -152,7 +152,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro ubuntu-ports': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'reprepro-ubuntu-ports'), command => 'flock -n /var/run/reprepro/ubuntu-ports.lock reprepro-mirror-update /etc/reprepro/ubuntu-ports mirror.ubuntu-ports >>/var/log/reprepro/ubuntu-ports-mirror.log 2>&1', @@ -190,7 +190,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro debian ceph hammer': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'debian-ceph-hammer'), command => 'flock -n /var/run/reprepro/debian-ceph-hammer.lock reprepro-mirror-update /etc/reprepro/debian-ceph-hammer mirror.deb-hammer >>/var/log/reprepro/debian-ceph-hammer-mirror.log 2>&1', @@ -212,7 +212,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro debian ceph jewel': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'debian-ceph-jewel'), command => 'flock -n /var/run/reprepro/debian-ceph-jewel.lock reprepro-mirror-update /etc/reprepro/debian-ceph-jewel mirror.deb-jewel >>/var/log/reprepro/debian-ceph-jewel-mirror.log 2>&1', @@ -234,7 +234,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro debian ceph luminous': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'debian-ceph-luminous'), command => 'flock -n /var/run/reprepro/debian-ceph-luminous.lock reprepro-mirror-update /etc/reprepro/debian-ceph-luminous mirror.deb-luminous >>/var/log/reprepro/debian-ceph-luminous-mirror.log 2>&1', @@ -256,7 +256,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro debian ceph mimic': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'debian-ceph-mimic'), command => 'flock -n /var/run/reprepro/debian-ceph-mimic.lock reprepro-mirror-update /etc/reprepro/debian-ceph-mimic mirror.deb-mimic >>/var/log/reprepro/debian-ceph-mimic-mirror.log 2>&1', @@ -288,7 +288,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro debian docker': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'debian-docker'), command => 'flock -n /var/run/reprepro/debian-docker.lock reprepro-mirror-update /etc/reprepro/debian-docker mirror.deb-docker >>/var/log/reprepro/debian-docker-mirror.log 2>&1', @@ -322,7 +322,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro ubuntu puppetlabs': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'ubuntu-puppetlabs'), command => 'flock -n /var/run/reprepro/apt-puppetlabs.lock reprepro-mirror-update /etc/reprepro/apt-puppetlabs mirror.apt-puppetlabs >>/var/log/reprepro/apt-puppetlabs-mirror.log 2>&1', @@ -360,7 +360,7 @@ class openstack_project::mirror_update ( } cron { 'centos mirror': - user => $user, + user => 'root', minute => fqdn_rand(45, 'centos-mirror'), hour => '*/2', command => 'flock -n /var/run/centos-mirror.lock centos-mirror-update mirror.centos >>/var/log/centos-mirror.log 2>&1', @@ -402,7 +402,7 @@ class openstack_project::mirror_update ( } cron { 'epel mirror': - user => $user, + user => 'root', minute => fqdn_rand(45, 'epel-mirror'), hour => '*/2', command => 'flock -n /var/run/epel-mirror.lock epel-mirror-update mirror.epel >>/var/log/epel-mirror.log 2>&1', @@ -431,7 +431,7 @@ class openstack_project::mirror_update ( } cron { 'yum-puppetlabs mirror': - user => $user, + user => 'root', minute => fqdn_rand(45, 'yum-puppetlabs'), hour => '*/2', command => 'flock -n /var/run/yum-puppetlabs-mirror.lock yum-puppetlabs-mirror-update mirror.yum-puppetlabs >>/var/log/yum-puppetlabs-mirror.log 2>&1', @@ -460,7 +460,7 @@ class openstack_project::mirror_update ( } cron { 'fedora mirror': - user => $user, + user => 'root', minute => fqdn_rand(45, 'fedora-mirror'), hour => '*/2', command => 'flock -n /var/run/fedora-mirror.lock fedora-mirror-update mirror.fedora >>/var/log/fedora-mirror.log 2>&1', @@ -489,7 +489,7 @@ class openstack_project::mirror_update ( } cron { 'opensuse mirror': - user => $user, + user => 'root', minute => fqdn_rand(45, 'opensuse-mirror'), hour => '*/2', command => 'flock -n /var/run/opensuse-mirror.lock opensuse-mirror-update mirror.opensuse >>/var/log/opensuse-mirror.log 2>&1', @@ -511,7 +511,7 @@ class openstack_project::mirror_update ( } cron { 'reprepro ubuntu-cloud-archive': - user => $user, + user => 'root', hour => '*/2', minute => fqdn_rand(45, 'ubuntu-cloud-archive-mirror'), command => 'flock -n /var/run/reprepro/ubuntu-cloud-archive.lock reprepro-mirror-update /etc/reprepro/ubuntu-cloud-archive mirror.ubuntu-cloud >>/var/log/reprepro/ubuntu-cloud-archive-mirror.log 2>&1',