Fixes to get gem mirror working

More gem mirror into a bash script, and run as root. This is needed
for vos release.

Change-Id: I46407fd7dbdfe6c1add1bffab892a8dcfcaafe03
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-12-23 13:20:20 -05:00
parent 061c04397b
commit 019072eada
3 changed files with 38 additions and 3 deletions

View File

@ -0,0 +1,28 @@
#!/bin/bash
# Copyright 2016 IBM Corp.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
set -e
date --iso-8601=ns
echo "Obtaining gem tokens and running gem mirror."
k5start -t -f /etc/gem.keytab service/gem-mirror -- timeout -k 2m 30m sudo -H -u rubygems bash -c 'gem mirror'
date --iso-8601=ns
echo "Gem mirror completed successfully, running vos release."
k5start -t -f /etc/afsadmin.keytab service/afsadmin -- vos release -v mirror.gem
date --iso-8601=ns
echo "Done."

View File

@ -73,6 +73,14 @@ class openstack_project::mirror_update (
source => 'puppet:///modules/openstack_project/bandersnatch-mirror-update.sh', source => 'puppet:///modules/openstack_project/bandersnatch-mirror-update.sh',
} }
file { '/usr/local/bin/gem-mirror-update':
ensure => present,
owner => 'root',
group => 'root',
mode => '0755',
source => 'puppet:///modules/openstack_project/gem-mirror-update.sh',
}
file { '/usr/local/bin/npm-mirror-update': file { '/usr/local/bin/npm-mirror-update':
ensure => present, ensure => present,
owner => 'root', owner => 'root',
@ -95,9 +103,8 @@ class openstack_project::mirror_update (
} }
cron { 'rubygems-mirror': cron { 'rubygems-mirror':
user => 'rubygems',
minute => '*/5', minute => '*/5',
command => 'flock -n /var/run/rubygems/mirror.lock timeout -k 2m 30m gem mirror >>/var/log/rubygems/mirror.log 2>&1', command => 'flock -n /var/run/rubygems/mirror.lock gem-mirror-update >>/var/log/rubygems/mirror.log 2>&1',
environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', environment => 'PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin',
require => [ require => [
File['/etc/afsadmin.keytab'], File['/etc/afsadmin.keytab'],

View File

@ -1,4 +1,4 @@
--- ---
- from: http://rubygems.org - from: http://rubygems.org
to: <%= @destination_path %> to: <%= @data_directory %>
parallelism: <%= @parallelism %> parallelism: <%= @parallelism %>