Mergh branch 'release/v2.1.4' into master

Author: lae

.travis.yml

@@ -13,6 +13,7 @@ matrix:
   fast_finish: true
 env:
 - LXC_DISTRO=debian LXC_RELEASE=jessie
+- LXC_DISTRO=debian LXC_RELEASE=stretch
 - LXC_DISTRO=ubuntu LXC_RELEASE=xenial
 - LXC_DISTRO=centos LXC_RELEASE=7
 before_cache:
@@ -27,7 +28,7 @@ install:
 - sudo apt-get install -y expect-dev
 - pip install ansible
 - ansible --version
-- printf '[defaults]\nroles_path=../\ncallback_whitelist=profile_tasks' >ansible.cfg
+- printf '[defaults]\nroles_path=../\ncallback_whitelist=profile_tasks\nforks=10\npipelining=True' >ansible.cfg
 - ansible-galaxy install lae.travis-lxc
 - ansible-playbook -vvv tests/install.yml -i tests/inventory
 script:

defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 # defaults file for lae.netbox
 netbox_stable: false
-netbox_stable_version: 2.1.3
+netbox_stable_version: 2.1.4
 netbox_stable_uri: "https://github.com/digitalocean/netbox/archive/v{{ netbox_stable_version }}.tar.gz"
 
 netbox_git: false
@@ -28,6 +28,7 @@ netbox_config:
     - 127.0.0.1
   #NAPALM_USERNAME:
   #NAPALM_PASSWORD:
+  MEDIA_ROOT: "{{ netbox_shared_path }}/media"
 
 netbox_user: netbox
 netbox_group: netbox

tasks/deploy_netbox.yml

@@ -63,14 +63,16 @@
   notify:
     - reload netbox.service
 
-- name: Set MEDIA_ROOT to shared media directory
+- name: Set MEDIA_ROOT to shared media directory (will be deprecated - if this is not skipped please update your NetBox)
   lineinfile:
     path: "{{ netbox_config_path }}/settings.py"
     regexp: '^MEDIA_ROOT\s*='
     line: 'MEDIA_ROOT = "{{ netbox_shared_path }}/media/"'
     state: present
   notify:
     - reload netbox.service
+  when:
+    - (netbox_stable and netbox_stable_version | version_compare('2.1.4', '<')) or (netbox_git and __netbox_git_contains_media_root_change.rc == 1)
 
 - name: Run database migrations for NetBox
   django_manage:

tasks/install_via_git.yml

@@ -11,6 +11,20 @@
     path: "{{ netbox_git_deploy_path }}"
     state: directory
 
+- name: Check existence of commit 643f64d, affecting MEDIA_ROOT
+  shell: 'git log --format=%H "{{ netbox_git_version }}" | grep ^643f64df3f02912957c2faf1a7555876fe00e2bc'
+  args:
+    chdir: "{{ netbox_git_repo_path }}"
+  register: __netbox_git_contains_media_root_change
+  changed_when: False
+  failed_when: "__netbox_git_contains_media_root_change.rc not in [0, 1]"
+
+- name: Ensure MEDIA_ROOT is defined if commit 643f64d exists
+  fail:
+    msg: "Please define MEDIA_ROOT in netbox_config."
+  when:
+    - __netbox_git_contains_media_root_change.rc == 0 and "MEDIA_ROOT" not in netbox_config
+
 - name: Archive and extract snapshot of git repository
   shell: 'git archive "{{ netbox_git_version }}" | tar -x -C "{{ netbox_git_deploy_path }}"'
   args:

tasks/validate_variables.yml

@@ -36,3 +36,9 @@
     msg: "Please define NAPALM_USERNAME and NAPALM_PASSWORD in netbox_config to use NAPALM."
   when:
     - netbox_napalm_enabled and ("NAPALM_USERNAME" not in netbox_config or "NAPALM_PASSWORD" not in netbox_config)
+
+- name: Ensure MEDIA_ROOT is defined
+  fail:
+    msg: "Please define MEDIA_ROOT in netbox_config."
+  when:
+    - netbox_stable and netbox_stable_version | version_compare('2.1.4', '<') and "MEDIA_ROOT" not in netbox_config

tests/group_vars/netbox

@@ -4,6 +4,7 @@ netbox_socket: "0.0.0.0:8080"
 netbox_config:
   ALLOWED_HOSTS:
     - "{{ inventory_hostname }}"
+  MEDIA_ROOT: "{{ netbox_shared_path }}/media"
 netbox_superuser_password: netbox
 netbox_database: "netbox_{{ inventory_hostname_short }}"
 netbox_database_host: 10.0.3.1

vars/debian-8.yml

@@ -21,4 +21,3 @@ netbox_pip3_binary: /usr/bin/pip3
 netbox_ldap_packages:
   - libldap2-dev
   - libsasl2-dev
-  - libssl-dev

vars/debian-9.yml

@@ -0,0 +1,23 @@
+---
+netbox_packages:
+  - libxml2-dev
+  - libxslt1-dev
+  - libffi-dev
+  - graphviz
+  - libpq-dev
+  - libssl-dev
+netbox_python2_packages:
+  - python2.7
+  - python-dev
+  - python-pip
+netbox_python2_binary: /usr/bin/python2.7
+netbox_pip2_binary: /usr/bin/pip2
+netbox_python3_packages:
+  - python3.5
+  - python3.5-dev
+  - python3-pip
+netbox_python3_binary: /usr/bin/python3.5
+netbox_pip3_binary: /usr/bin/pip3
+netbox_ldap_packages:
+  - libldap2-dev
+  - libsasl2-dev

vars/ubuntu-16.yml

@@ -21,4 +21,3 @@ netbox_pip3_binary: /usr/bin/pip3
 netbox_ldap_packages:
   - libldap2-dev
   - libsasl2-dev
-  - libssl-dev