Skip to content

Commit 01ecdfe

Browse files
authored
SYS-477 housekeeping - remove stale images plus ansible update (#229)
1 parent 5984058 commit 01ecdfe

30 files changed

Lines changed: 12 additions & 3124 deletions

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ The cluster-deployment tools here include helm charts and ansible playbooks to s
5656
| jira | ** | ticket tracking |
5757
| mariadb-galera | [![](https://img.shields.io/docker/v/instantlinux/mariadb-galera?sort=date)](https://hub.docker.com/r/instantlinux/mariadb-galera "Version badge") | automatic cluster setup|
5858
| nexus | ** | binary repo with docker registry |
59-
| python-builder | [![](https://img.shields.io/docker/v/instantlinux/python-builder?sort=date)](https://hub.docker.com/r/instantlinux/python-builder "Version badge") | CI testing for python|
60-
| python-wsgi | [![](https://img.shields.io/docker/v/instantlinux/python-wsgi?sort=date)](https://hub.docker.com/r/instantlinux/python-wsgi "Version badge") | WSGI runtime for python flask apps|
6159
| synapse | ** | self-hosted team chat |
6260
| wordpress | ** | |
6361

ansible/ansible.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[defaults]
2-
ansible_managed = This file is managed by Ansible.%n
2+
managed_str = This file is managed by Ansible.%n
33
template: {file}
44
date: %Y-%m-%d %H:%M:%S
55
user: {uid}

ansible/requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ansible==8.2.0
2-
ansible-lint==6.17.2
3-
pip==23.2.1
1+
ansible==12.0.0
2+
ansible-lint==25.9.1
3+
pip==25.2

ansible/roles/fileserver/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@
1515
when: ansible_distribution_version < '20.04'
1616

1717
- import_tasks: nfs.yml
18-
when: nfs_exports
18+
when: nfs_exports | length > 0
1919

2020
- name: Disable nfs-server
2121
systemd:
2222
name: nfs-server
2323
state: stopped
2424
enabled: no
25-
when: not nfs_exports
25+
when: nfs_exports | length == 0
2626

2727
- name: Disable rpcbind if no network volumes
2828
systemd:
2929
name: rpcbind
3030
state: stopped
3131
enabled: no
32-
when: not nfs_exports
32+
when: nfs_exports | length == 0
3333

3434
- import_tasks: instantlinux.yml
3535

ansible/roles/kubernetes/tasks/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757

5858
- name: Set up control plane
5959
include_tasks: cplane.yml
60-
when: k8s.cplane
60+
when: k8s.cplane | length > 0
6161

6262
- name: Join cluster
6363
include_tasks: join.yml
64-
when: not k8s.cplane
64+
when: k8s.cplane | length == 0
6565

6666
- name: Add RequiresMountsFor to kubelet.service
6767
copy:

images/nut-upsd/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ USER | nut | local user
6262
VENDORID | | vendor ID for ups.conf
6363
### Notes
6464

65-
To define a notify script, volume-mount it via your docker-compose file under /usr/local/bin and set the NOTIFYCMD environment variable. (*Don't* mount any executable scripts under /etc/nut, put them under /usr/local).
65+
To define a notify script, volume-mount it via your docker-compose file under /usr/local/bin or in your helm values overrides and set the NOTIFYCMD environment variable. (*Don't* mount any executable scripts under /etc/nut, put them under /usr/local).
6666

6767
If you need a driver other than `usbhid-ups`, the full list of supported drivers can be listed as follows:
6868
```

images/python-builder/Dockerfile

Lines changed: 0 additions & 76 deletions
This file was deleted.

images/python-builder/Jenkinsfile

Lines changed: 0 additions & 61 deletions
This file was deleted.

images/python-builder/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

images/python-builder/Pipfile

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)