Merge pull request #3968 from edx/update-neo4j-to-3.2.1

Upgrade neo4j to 3.2.1

CHANGELOG.md

+- Role: neo4j
+  - Updated neo4j to 3.2.2
+  - Removed authentication requirement for neo4j
+
 - Role: forum
   - Added `FORUM_REBUILD_INDEX` to rebuild the ElasticSearch index from the database, when enabled.  Default: `False`.
 

playbooks/roles/neo4j/defaults/main.yml

@@ -17,19 +17,25 @@
 # vars are namespaced with the module name.
 #
 NEO4J_SERVER_NAME: "localhost"
+NEO4J_AUTH_ENABLED: "true"
 
 neo4j_gpg_key_url: https://debian.neo4j.org/neotechnology.gpg.key
 neo4j_apt_repository: "deb http://debian.neo4j.org/repo stable/"
-neo4j_version: "3.0.3"
 neo4j_defaults_file: "/etc/default/neo4j"
+neo4j_version: "3.2.2"
 neo4j_server_config_file: "/etc/neo4j/neo4j.conf"
-neo4j_wrapper_config_file: "/etc/neo4j/neo4j-wrapper.conf"
 neo4j_https_port: 7473  # default in package is 7473
 neo4j_http_port: 7474  # default in package is 7474
 neo4j_listen_address: "0.0.0.0"
-neo4j_heap_max_size: "3000"
+neo4j_heap_max_size: "3000m"
+neo4j_page_cache_size: "3000m"
 neo4j_log_dir: "/var/log/neo4j"
 
 # Properties file settings
-neo4j_https_settings_key: "dbms.connector.https.address"
-neo4j_http_settings_key: "dbms.connector.http.address"
+neo4j_https_settings_key: "dbms.connector.https.listen_address"
+neo4j_http_settings_key: "dbms.connector.http.listen_address"
+
+# Deprecated files to delete
+deprecated_neo4j_wrapper_config_file: "/etc/neo4j/neo4j-wrapper.conf"
+deprecated_neo4j_https_settings_key: "dbms.connector.https.address"
+deprecated_neo4j_http_settings_key: "dbms.connector.http.address"

playbooks/roles/neo4j/tasks/main.yml

@@ -37,6 +37,14 @@
     - install
     - install:system-requirements
 
+- name: remove deprecated config file
+  file:
+    state: absent
+    path: "{{ deprecated_neo4j_wrapper_config_file }}"
+  tags:
+    - install
+    - install:base
+
 - name: install neo4j
   apt:
     name: "neo4j={{neo4j_version}}"
@@ -45,17 +53,48 @@
     - install
     - install:base
 
+- name: enable or disable authentication
+  lineinfile:
+    dest: "{{ neo4j_server_config_file }}"
+    regexp: "dbms.security.auth_enabled="
+    line: "dbms.security.auth_enabled={{ NEO4J_AUTH_ENABLED }}"
+  tags:
+    - install
+    - install:configuration
+
+- name: set neo4j page cache size
+  lineinfile:
+    dest: "{{ neo4j_server_config_file }}"
+    regexp: "dbms.memory.pagecache.size="
+    line: "dbms.memory.pagecache.size={{ neo4j_page_cache_size }}"
+  tags:
+    - install
+    - install:configuration
+
 - name: set neo4j heap size
   lineinfile:
-    dest: "{{ neo4j_wrapper_config_file }}"
-    regexp: "dbms.memory.heap.max_size="
-    line: "dbms.memory.heap.max_size={{ neo4j_heap_max_size }}"
+    dest: "{{ neo4j_server_config_file }}"
+    regexp: "{{ item }}="
+    line: "{{ item }}={{ neo4j_heap_max_size }}"
+  with_items:
+    - "dbms.memory.heap.max_size"
+    - "dbms.memory.heap.initial_size"
+  tags:
+    - install
+    - install:configuration
+
+- name: allow format migration (when updating neo4j versions)
+  lineinfile:
+    dest: "{{ neo4j_server_config_file }}"
+    regexp: "dbms.allow_format_migration="
+    line: "dbms.allow_format_migration=true"
   tags:
     - install
     - install:configuration
 
 - name: set to listen on specific port for https
   lineinfile:
+    create: yes
     dest: "{{ neo4j_server_config_file }}"
     regexp: "{{ neo4j_https_settings_key }}="
     line: "{{ neo4j_https_settings_key }}={{ neo4j_listen_address }}:{{ neo4j_https_port }}"
@@ -65,6 +104,7 @@
 
 - name: set to listen on specific port for http
   lineinfile:
+    create: yes
     dest: "{{ neo4j_server_config_file }}"
     regexp: "{{ neo4j_http_settings_key }}="
     line: "{{ neo4j_http_settings_key }}={{ neo4j_listen_address }}:{{ neo4j_http_port }}"
@@ -72,12 +112,14 @@
     - install
     - install:configuration
 
-- name: set log dir for neo4j
+- name: remove deprecated listen address lines
   lineinfile:
-    create: yes
+    state: absent
     dest: "{{ neo4j_server_config_file }}"
-    regexp: "dbms.directories.logs="
-    line: "dbms.directories.logs={{ neo4j_log_dir }}"
+    regexp: "{{ item }}"
+  with_items:
+    - "{{ deprecated_neo4j_https_settings_key }}"
+    - "{{ deprecated_neo4j_http_settings_key }}"
   tags:
     - install
     - install:configuration