Resolve conflict in discovery role

playbooks/roles/discovery/tasks/main.yml

@@ -56,64 +56,54 @@
     - install
     - install:system-requirements
 
-- name: install application requirements
-  command: make production-requirements
-  args:
-    chdir: "{{ discovery_code_dir }}"
+- name: install nodenv
+  pip:
+    name: "nodeenv"
+    version: "1.1.0"
+    # NOTE (CCB): Using the "virtualenv" option here doesn't seem to work.
+    executable: "{{ discovery_venv_dir }}/bin/pip"
   become_user: "{{ discovery_user }}"
-  environment: "{{ discovery_environment }}"
   tags:
     - install
-    - install:app-requirements
-
-- name: install development requirements
-  command: make requirements
-  args:
-    chdir: "{{ discovery_code_dir }}"
-  become_user: "{{ discovery_user }}"
-  environment: "{{ discovery_environment }}"
-  tags:
-    - devstack
-    - devstack:install
+    - install:system-requirements
 
 # See https://github.com/ekalinin/nodeenv/issues/182
 # This can be removed once https://github.com/ekalinin/nodeenv/pull/183 is merged
-- name: Remove nodeenv src
+- name: remove nodeenv src
   file:
     path: "{{ discovery_nodeenv_dir }}/src"
     state: absent
   become_user: "{{ discovery_user }}"
   tags:
     - install
-    - install:app-requirements
+    - install:system-requirements
 
 - name: create nodeenv
   shell: "{{ discovery_venv_dir }}/bin/nodeenv {{ discovery_nodeenv_dir }} --node={{ discovery_node_version }} --prebuilt --force"
   become_user: "{{ discovery_user }}"
   tags:
     - install
-    - install:app-requirements
+    - install:system-requirements
 
-- name: install node dependencies
-  npm:
-    executable: "{{ discovery_nodeenv_bin }}/npm"
-    path: "{{ discovery_code_dir }}"
-    production: yes
-    state: latest
+- name: install application requirements
+  command: make production-requirements
+  args:
+    chdir: "{{ discovery_code_dir }}"
   become_user: "{{ discovery_user }}"
   environment: "{{ discovery_environment }}"
   tags:
     - install
     - install:app-requirements
 
-- name: install bower dependencies
-  shell: ". {{ discovery_nodeenv_bin }}/activate && {{ discovery_node_bin }}/bower install --production --config.interactive=false"
+- name: install development requirements
+  command: make requirements
   args:
     chdir: "{{ discovery_code_dir }}"
   become_user: "{{ discovery_user }}"
+  environment: "{{ discovery_environment }}"
   tags:
-    - install
-    - install:app-requirements
+    - devstack
+    - devstack:install
 
 - name: migrate database
   command: make migrate
@@ -257,4 +247,3 @@
   tags:
     - install
     - install:vhosts
-