diff --git a/modules/openstack_project/manifests/release_slave.pp b/modules/openstack_project/manifests/release_slave.pp index 1530baceb8..a0352f3389 100644 --- a/modules/openstack_project/manifests/release_slave.pp +++ b/modules/openstack_project/manifests/release_slave.pp @@ -53,25 +53,17 @@ class openstack_project::release_slave ( require => Class['pip'], } - exec { 'uninstall /usr/local/bin/npm': - command => 'npm uninstall npm --prefix=/usr/local -g', - onlyif => 'test -d /usr/local/lib/node_modules', - path => '/usr/local/bin:/usr/bin', + class { '::nodejs': + repo_url_suffix => 'node_0.12', } - package { ['npm', 'nodejs', 'nodejs-legacy']: - ensure => purged, - require => Exec['uninstall /usr/local/bin/npm'], - } - - file { ['/usr/share/npm', - '/usr/lib/node_modules', - '/root/.npm', - '/etc/npmrc', - '/home/jenkins/.npmrc']: - ensure => absent, - force => true, - require => Package['npm'] + file { '/home/jenkins/.npmrc': + ensure => present, + owner => 'jenkins', + group => 'jenkins', + mode => '0600', + content => template('openstack_project/npmrc.erb'), + require => File['/home/jenkins'], } file { '/home/jenkins/.pypirc': diff --git a/modules/openstack_project/templates/npmrc_jenkins.erb b/modules/openstack_project/templates/npmrc.erb similarity index 89% rename from modules/openstack_project/templates/npmrc_jenkins.erb rename to modules/openstack_project/templates/npmrc.erb index cf6550c5e6..9b267d8ad2 100644 --- a/modules/openstack_project/templates/npmrc_jenkins.erb +++ b/modules/openstack_project/templates/npmrc.erb @@ -4,6 +4,8 @@ init.author.name=<%= jenkins_gitfullname %> init.author.email=<%= jenkins_gitemail %> init.author.url=<%= npm_userurl %> +tag-version-prefix= +sign-git-tag=true //registry.npmjs.org/:username=<%= npm_username %> //registry.npmjs.org/:_password=<%= Base64.encode64(npm_userpassword) %>