Skip to content

Commit 2858bd2

Browse files
authored
Merge pull request #188 from lae/develop
release v1.0.7
2 parents b1f4673 + 7812f03 commit 2858bd2

File tree

4 files changed

+44
-2
lines changed

4 files changed

+44
-2
lines changed

tasks/deploy_netbox.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,5 +242,14 @@
242242
or netbox_git and ( _netbox_git_contains_add_clearcache.rc == 0
243243
and _netbox_git_contains_remove_clearcache.rc != 0 )
244244

245+
- name: Rebuild the search cache (lazily)
246+
django_manage:
247+
command: "reindex --lazy"
248+
app_path: "{{ netbox_current_path }}/netbox"
249+
virtualenv: "{{ netbox_virtualenv_path }}"
250+
when:
251+
- netbox_stable and netbox_stable_version is version('3.4.4', '>')
252+
or netbox_git and _netbox_git_contains_reindex_lazy.rc == 0
253+
245254
become: true
246255
become_user: "{{ netbox_user }}"

tasks/install_via_git.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@
9898
changed_when: False
9999
failed_when: "_netbox_git_contains_remove_clearcache.rc not in [0, 1]"
100100

101+
- name: Check existence of commit 5a4d8a7, adding the reindex lazy command
102+
shell: 'set -o pipefail; git log --format=%H "{{ netbox_git_version }}" | grep ^5a4d8a71075a4529be8d5ef22d76d69861240f45'
103+
args:
104+
chdir: "{{ netbox_git_repo_path }}"
105+
executable: /bin/bash
106+
register: _netbox_git_contains_reindex_lazy
107+
changed_when: False
108+
failed_when: "_netbox_git_contains_reindex_lazy.rc not in [0, 1]"
109+
101110
become: true
102111
become_user: "{{ netbox_user }}"
103112

vars/amazon-2023.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
netbox_install_epel: false
3+
_netbox_packages:
4+
- gcc
5+
- libpq-devel
6+
- libxml2-devel
7+
- libxslt-devel
8+
- libffi-devel
9+
- libjpeg-turbo-devel
10+
- graphviz
11+
- openssl-devel
12+
_netbox_python_packages:
13+
- python3
14+
- python3-devel
15+
- python3-setuptools
16+
- python3-psycopg2
17+
- python3-libselinux
18+
- python3-pip
19+
_netbox_python_binary: /usr/bin/python3.9
20+
_netbox_ldap_packages:
21+
- openldap-devel

vars/main.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ _netbox_storages_map:
1414
sftpstorage: []
1515

1616
netbox_superuser_script: |
17-
from django.contrib.auth.models import User
17+
from django.contrib.auth import get_user_model
1818
from base64 import b64decode
19+
User = get_user_model()
1920
password = b64decode("{{ netbox_superuser_password | b64encode }}").decode("UTF-8")
2021
query = User.objects.filter(username="{{ netbox_superuser_username }}")
2122
if not query.exists():
@@ -33,7 +34,8 @@ netbox_superuser_script: |
3334
3435
netbox_superuser_token: |
3536
from users.models import Token
36-
from django.contrib.auth.models import User
37+
from django.contrib.auth import get_user_model
38+
User = get_user_model()
3739
user = User.objects.get(username="{{ netbox_superuser_username }}")
3840
query = Token.objects.filter(user=user)
3941
if not query.exists():
@@ -45,3 +47,4 @@ netbox_python_compat_matrix:
4547
- { netbox_version_min: '2.8.0', python_needed: '3.6.0' }
4648
- { netbox_version_min: '3.0.0', python_needed: '3.7.0' }
4749
- { netbox_version_min: '3.2.0', python_needed: '3.8.0' }
50+
- { netbox_version_min: '4.0.0', python_needed: '3.10.0' }

0 commit comments

Comments
 (0)