diff --git a/modules/openstack_project/manifests/release_slave.pp b/modules/openstack_project/manifests/release_slave.pp index 4cadc5a35e..1530baceb8 100644 --- a/modules/openstack_project/manifests/release_slave.pp +++ b/modules/openstack_project/manifests/release_slave.pp @@ -53,28 +53,25 @@ class openstack_project::release_slave ( require => Class['pip'], } - package { ['nodejs', 'nodejs-legacy', 'npm']: - ensure => latest, - before => [ - Exec['upgrade npm'] - ] + 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', } - exec { 'assert npm@2': - command => 'npm install npm@2 -g --upgrade', - path => '/usr/local/bin:/usr/bin', - onlyif => '[ `npm --version | cut -c 1` = "1" ]', - require => [ - Package['npm'], - File['/etc/npmrc'], - ], + package { ['npm', 'nodejs', 'nodejs-legacy']: + ensure => purged, + require => Exec['uninstall /usr/local/bin/npm'], } - exec { 'upgrade npm': - command => 'npm install npm -g --upgrade', - path => '/usr/local/bin:/usr/bin', - onlyif => '[ `npm view npm version` != `npm --version` ]', - require => Exec['assert npm@2'], + 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/.pypirc': @@ -86,23 +83,6 @@ class openstack_project::release_slave ( require => File['/home/jenkins'], } - file { '/home/jenkins/.npmrc': - ensure => present, - owner => 'jenkins', - group => 'jenkins', - mode => '0600', - content => template('openstack_project/npmrc_jenkins.erb'), - require => File['/home/jenkins'], - } - - file { '/etc/npmrc': - ensure => present, - owner => 'root', - group => 'root', - mode => '0666', - content => template('openstack_project/npmrc_global.erb'), - } - file { '/home/jenkins/.jenkinsci-curl': ensure => present, owner => 'jenkins', diff --git a/modules/openstack_project/templates/npmrc_global.erb b/modules/openstack_project/templates/npmrc_global.erb deleted file mode 100644 index bdd42b825e..0000000000 --- a/modules/openstack_project/templates/npmrc_global.erb +++ /dev/null @@ -1,3 +0,0 @@ -tag-version-prefix= -sign-git-tag=true -prefix=/usr/local