opendev/system-config
Code Issues Proposed changes

Merge "Added clean exit hooks to npm registry script"

Browse Source
This commit is contained in:
Jenkins 2016-05-10 16:20:54 +00:00 committed by Gerrit Code Review
commit 6c21d3a340
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/manifests/npm_mirror.pp
View File

@ -49,4 +49,13 @@ class openstack_project::npm_mirror (
Class['nodejs'],
]
}
# Common registry hooks
package { 'openstack-registry-hooks':
ensure => '1.1.0',
provider => 'npm',
require => [
Class['nodejs'],
]
}
}

2
modules/openstack_project/templates/npm-mirror-update.sh
View File

@ -17,7 +17,7 @@
set -e
CMD="/usr/bin/registry-static"
CMD_ARGS="-d <%= @uri_rewrite %> -o <%= @data_directory %> --blobstore afs-blob-store"
CMD_ARGS="-d <%= @uri_rewrite %> -o <%= @data_directory %> --blobstore afs-blob-store --hooks openstack-registry-hooks"
echo "Obtaining npm tokens and running registry-static."
k5start -t -f /etc/npm.keytab service/npm -- timeout -k 2m 30m $CMD $CMD_ARGS