Skip to content

Commit a28aaa2

Browse files
author
Bill Meek
committed
Old directories: removal cleanup
Enable role-name in ansible-lint Remove roles from mythtv.yml Remove use_old_roles* from README and group_vars files as well as in tools*
1 parent 55d1d4b commit a28aaa2

6 files changed

Lines changed: 2 additions & 56 deletions

File tree

.ansible-lint

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ skip_list:
2424
- role-name[path]
2525
- fqcn
2626
- var-naming[no-role-prefix]
27-
- role-name
2827

2928
warn_list:
3029
- latest[git]

group_vars/README

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ _________________________________________________________________________
1515

1616
---
1717

18-
# Set to true to enable use of the Single Role, this variable is going away
19-
#use_old_roles: false
20-
2118
# Set to true to install perl modules using cpanm
2219
#cpanm_active: false
2320

group_vars/all.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ local_ansible_managed: "
1111
manual_action_text: 'MANUAL ACTION REQUIRED'
1212
instruction_text: 'Please include the following with any issues or questions'
1313

14-
# See mythtv.yml and roles/mythtv/tasks/main.yml for detail (both will go away):
15-
use_old_roles: false
16-
use_old_roles_failure_test: false
17-
1814
# Perl CPANM installation
1915
# added for situations where the package manger does not provide perl modules (e.g. homebrew)
2016
cpanm_active: false

mythtv.yml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -27,49 +27,6 @@
2727
- include_role:
2828
name: mythtv
2929
when:
30-
- not use_old_roles
31-
- not mythtv_tools
32-
33-
- include_role:
34-
name: mythtv-deb
35-
when:
36-
- ansible_pkg_mgr == "apt"
37-
- use_old_roles
38-
- not mythtv_tools
39-
40-
- include_role:
41-
name: mythtv-rpm
42-
when:
43-
- ansible_pkg_mgr == "yum"
44-
- use_old_roles
45-
- not mythtv_tools
46-
47-
- include_role:
48-
name: mythtv-dnf
49-
when:
50-
- ansible_pkg_mgr in [ "dnf", "dnf5" ]
51-
- use_old_roles
52-
- not mythtv_tools
53-
54-
- include_role:
55-
name: mythtv-freebsd
56-
when:
57-
- ansible_pkg_mgr == "pkgng"
58-
- use_old_roles
59-
- not mythtv_tools
60-
61-
- include_role:
62-
name: mythtv-pacman
63-
when:
64-
- ansible_pkg_mgr == "pacman"
65-
- use_old_roles
66-
- not mythtv_tools
67-
68-
- include_role:
69-
name: mythtv-suse
70-
when:
71-
- ansible_pkg_mgr == "zypper"
72-
- use_old_roles
7330
- not mythtv_tools
7431

7532
- include_role:
@@ -86,14 +43,12 @@
8643
name: qt5
8744
when:
8845
- not mythtv_tools
89-
- use_old_roles
9046
- not qt6
9147

9248
- include_role:
9349
name: qt6
9450
when:
9551
- not mythtv_tools
96-
- use_old_roles
9752
- qt6
9853

9954
- include_role:

tools/aliases_and_functions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ alias avenv=". ~/.virtualenvs/mythtv/bin/activate"
4545
# Turn on the Virtual Environment feature:
4646
alias rvenv="./mythtv.yml --limit=localhost --extra-vars='{\"venv_active\":true}'"
4747
# Turn on the above AND the new roles layout with qt5 or 6:
48-
alias svenv="./mythtv.yml --limit=localhost --extra-vars='{\"venv_active\":true}' --extra-vars='{\"use_old_roles\":false}'"
49-
alias svenv6="./mythtv.yml --limit=localhost --extra-vars='{\"venv_active\":true}' --extra-vars='{\"use_old_roles\":false}' --extra-vars='{\"qt6\":true}'"
48+
alias svenv="./mythtv.yml --limit=localhost --extra-vars='{\"venv_active\":true}'"
49+
alias svenv6="./mythtv.yml --limit=localhost --extra-vars='{\"venv_active\":true}' --extra-vars='{\"qt6\":true}'"
5050

5151
# Additional convenience items:
5252
alias ad='ansible-doc'

tools/rhosts.sample

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ mythtv_hosts:
2828
vars:
2929
mythtv_builders: false # Don't change this
3030
mythtv_tools: false # Don't change this
31-
use_old_roles: false # Don't change this
3231
qt6: false
3332

3433
hosts:

0 commit comments

Comments
 (0)