Skip to content

Commit bb34b07

Browse files
committed
remove nodejs role dependency
For trusty, it can be added to the singlenode playbook, and apply it conditionally TODO: - Install centos-release-scl-rh on centos/rhel - Add npm/rh-nodejs8-npm to osdeps
1 parent aef2863 commit bb34b07

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

meta/main.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@ galaxy_info:
44
description: An ansible role for installing Archivematica from source.
55
company: Artefactual Systems
66
license: AGPLv3
7-
min_ansible_version: 2.3
7+
min_ansible_version: 2.7
88
platforms:
99
- name: EL
1010
versions:
1111
- 7
1212
- name: Ubuntu
1313
versions:
14-
- trusty
1514
- xenial
16-
17-
dependencies:
18-
- role: geerlingguy.nodejs
19-
version: 4.1.1
20-
nodejs_version: 8.x
15+
- bionic

tasks/pipeline-instcode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
- name: "Install front-end dependencies"
5555
become: "yes"
5656
become_user: "archivematica"
57-
command: npm install
57+
command: "{{ npm_path }}/npm install"
5858
args:
5959
chdir: "{{ item }}"
6060
with_items:

vars/Debian.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ ansible_deps:
66
- "python-mysqldb" # Required for mysql_db module
77
- "sqlite3" # Required for am-configure and fixity
88
ca_custom_bundle: "/etc/ssl/certs/ca-certificates.crt"
9+
npm_path: "/usr/bin/npm"

vars/RedHat.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ ansible_deps:
77
- "sqlite" # Required for am-configure and fixity
88
- "p7zip-plugins"
99
ca_custom_bundle: "/etc/pki/tls/certs/ca-bundle.crt"
10+
npm_path: "/opt/rh/rh-nodejs8/root/bin/"

0 commit comments

Comments
 (0)