fix: add playbooks in the python package

brian-pond · May 1, 2020 · 78e1f03 · 78e1f03
1 parent e791410
commit 78e1f03
Show file tree

Hide file tree

Showing 87 changed files with 10 additions and 6 deletions.
diff --git a/playbooks/README.md → bench/playbooks/README.md b/playbooks/README.md → bench/playbooks/README.md
diff --git a/playbooks/create_user.yml → bench/playbooks/create_user.yml b/playbooks/create_user.yml → bench/playbooks/create_user.yml
diff --git a/playbooks/install.py → bench/playbooks/install.py b/playbooks/install.py → bench/playbooks/install.py
@@ -359,7 +359,7 @@ def run_playbook(playbook_name, sudo=False, extra_vars=None):
 	else:
 		cwd = os.path.join(os.path.expanduser('~'), 'bench')
 
-	success = subprocess.check_call(args, cwd=os.path.join(cwd, 'playbooks'), stdout=log_stream, stderr=sys.stderr)
+	success = subprocess.check_call(args, cwd=os.path.join(cwd, 'bench', 'playbooks'), stdout=log_stream, stderr=sys.stderr)
 	return success
 
 

diff --git a/playbooks/macosx.yml → bench/playbooks/macosx.yml b/playbooks/macosx.yml → bench/playbooks/macosx.yml
diff --git a/...les/bash_screen_wall/files/screen_wall.sh → ...les/bash_screen_wall/files/screen_wall.sh b/...les/bash_screen_wall/files/screen_wall.sh → ...les/bash_screen_wall/files/screen_wall.sh
diff --git a/...oks/roles/bash_screen_wall/tasks/main.yml → ...oks/roles/bash_screen_wall/tasks/main.yml b/...oks/roles/bash_screen_wall/tasks/main.yml → ...oks/roles/bash_screen_wall/tasks/main.yml
diff --git a/...oks/roles/bench/tasks/change_ssh_port.yml → ...oks/roles/bench/tasks/change_ssh_port.yml b/...oks/roles/bench/tasks/change_ssh_port.yml → ...oks/roles/bench/tasks/change_ssh_port.yml
diff --git a/playbooks/roles/bench/tasks/main.yml → bench/playbooks/roles/bench/tasks/main.yml b/playbooks/roles/bench/tasks/main.yml → bench/playbooks/roles/bench/tasks/main.yml
diff --git a/...es/bench/tasks/setup_bench_production.yml → ...es/bench/tasks/setup_bench_production.yml b/...es/bench/tasks/setup_bench_production.yml → ...es/bench/tasks/setup_bench_production.yml
diff --git a/...books/roles/bench/tasks/setup_erpnext.yml → ...books/roles/bench/tasks/setup_erpnext.yml b/...books/roles/bench/tasks/setup_erpnext.yml → ...books/roles/bench/tasks/setup_erpnext.yml
diff --git a/...ooks/roles/bench/tasks/setup_firewall.yml → ...ooks/roles/bench/tasks/setup_firewall.yml b/...ooks/roles/bench/tasks/setup_firewall.yml → ...ooks/roles/bench/tasks/setup_firewall.yml
diff --git a/...books/roles/bench/tasks/setup_inputrc.yml → ...books/roles/bench/tasks/setup_inputrc.yml b/...books/roles/bench/tasks/setup_inputrc.yml → ...books/roles/bench/tasks/setup_inputrc.yml
diff --git a/playbooks/roles/common/tasks/debian.yml → ...h/playbooks/roles/common/tasks/debian.yml b/playbooks/roles/common/tasks/debian.yml → ...h/playbooks/roles/common/tasks/debian.yml
diff --git a/...ooks/roles/common/tasks/debian_family.yml → ...ooks/roles/common/tasks/debian_family.yml b/...ooks/roles/common/tasks/debian_family.yml → ...ooks/roles/common/tasks/debian_family.yml
diff --git a/playbooks/roles/common/tasks/macos.yml → bench/playbooks/roles/common/tasks/macos.yml b/playbooks/roles/common/tasks/macos.yml → bench/playbooks/roles/common/tasks/macos.yml
diff --git a/playbooks/roles/common/tasks/main.yml → bench/playbooks/roles/common/tasks/main.yml b/playbooks/roles/common/tasks/main.yml → bench/playbooks/roles/common/tasks/main.yml
diff --git a/...ooks/roles/common/tasks/redhat_family.yml → ...ooks/roles/common/tasks/redhat_family.yml b/...ooks/roles/common/tasks/redhat_family.yml → ...ooks/roles/common/tasks/redhat_family.yml
diff --git a/playbooks/roles/common/tasks/ubuntu.yml → ...h/playbooks/roles/common/tasks/ubuntu.yml b/playbooks/roles/common/tasks/ubuntu.yml → ...h/playbooks/roles/common/tasks/ubuntu.yml
diff --git a/...books/roles/dns_caching/handlers/main.yml → ...books/roles/dns_caching/handlers/main.yml b/...books/roles/dns_caching/handlers/main.yml → ...books/roles/dns_caching/handlers/main.yml
diff --git a/playbooks/roles/dns_caching/tasks/main.yml → ...laybooks/roles/dns_caching/tasks/main.yml b/playbooks/roles/dns_caching/tasks/main.yml → ...laybooks/roles/dns_caching/tasks/main.yml
diff --git a/playbooks/roles/fail2ban/defaults/main.yml → ...laybooks/roles/fail2ban/defaults/main.yml b/playbooks/roles/fail2ban/defaults/main.yml → ...laybooks/roles/fail2ban/defaults/main.yml
diff --git a/playbooks/roles/fail2ban/handlers/main.yml → ...laybooks/roles/fail2ban/handlers/main.yml b/playbooks/roles/fail2ban/handlers/main.yml → ...laybooks/roles/fail2ban/handlers/main.yml
diff --git a/...s/fail2ban/tasks/configure_nginx_jail.yml → ...s/fail2ban/tasks/configure_nginx_jail.yml b/...s/fail2ban/tasks/configure_nginx_jail.yml → ...s/fail2ban/tasks/configure_nginx_jail.yml
diff --git a/playbooks/roles/fail2ban/tasks/main.yml → ...h/playbooks/roles/fail2ban/tasks/main.yml b/playbooks/roles/fail2ban/tasks/main.yml → ...h/playbooks/roles/fail2ban/tasks/main.yml
diff --git a/...2ban/templates/nginx-proxy-filter.conf.j2 → ...2ban/templates/nginx-proxy-filter.conf.j2 b/...2ban/templates/nginx-proxy-filter.conf.j2 → ...2ban/templates/nginx-proxy-filter.conf.j2
diff --git a/...il2ban/templates/nginx-proxy-jail.conf.j2 → ...il2ban/templates/nginx-proxy-jail.conf.j2 b/...il2ban/templates/nginx-proxy-jail.conf.j2 → ...il2ban/templates/nginx-proxy-jail.conf.j2
diff --git a/...es/frappe_selinux/files/frappe_selinux.te → ...es/frappe_selinux/files/frappe_selinux.te b/...es/frappe_selinux/files/frappe_selinux.te → ...es/frappe_selinux/files/frappe_selinux.te
diff --git a/...books/roles/frappe_selinux/tasks/main.yml → ...books/roles/frappe_selinux/tasks/main.yml b/...books/roles/frappe_selinux/tasks/main.yml → ...books/roles/frappe_selinux/tasks/main.yml
diff --git a/playbooks/roles/locale/defaults/main.yml → .../playbooks/roles/locale/defaults/main.yml b/playbooks/roles/locale/defaults/main.yml → .../playbooks/roles/locale/defaults/main.yml
diff --git a/playbooks/roles/locale/tasks/main.yml → bench/playbooks/roles/locale/tasks/main.yml b/playbooks/roles/locale/tasks/main.yml → bench/playbooks/roles/locale/tasks/main.yml
diff --git a/playbooks/roles/logwatch/defaults/main.yml → ...laybooks/roles/logwatch/defaults/main.yml b/playbooks/roles/logwatch/defaults/main.yml → ...laybooks/roles/logwatch/defaults/main.yml
diff --git a/playbooks/roles/logwatch/tasks/main.yml → ...h/playbooks/roles/logwatch/tasks/main.yml b/playbooks/roles/logwatch/tasks/main.yml → ...h/playbooks/roles/logwatch/tasks/main.yml
diff --git a/...roles/logwatch/templates/logwatch.conf.j2 → ...roles/logwatch/templates/logwatch.conf.j2 b/...roles/logwatch/templates/logwatch.conf.j2 → ...roles/logwatch/templates/logwatch.conf.j2
diff --git a/playbooks/roles/mariadb/README.md → bench/playbooks/roles/mariadb/README.md b/playbooks/roles/mariadb/README.md → bench/playbooks/roles/mariadb/README.md
diff --git a/playbooks/roles/mariadb/defaults/main.yml → ...playbooks/roles/mariadb/defaults/main.yml b/playbooks/roles/mariadb/defaults/main.yml → ...playbooks/roles/mariadb/defaults/main.yml
diff --git a/...s/mariadb/files/debian_mariadb_config.cnf → ...s/mariadb/files/debian_mariadb_config.cnf b/...s/mariadb/files/debian_mariadb_config.cnf → ...s/mariadb/files/debian_mariadb_config.cnf
diff --git a/...ks/roles/mariadb/files/mariadb_config.cnf → ...ks/roles/mariadb/files/mariadb_config.cnf b/...ks/roles/mariadb/files/mariadb_config.cnf → ...ks/roles/mariadb/files/mariadb_config.cnf
diff --git a/playbooks/roles/mariadb/handlers/main.yml → ...playbooks/roles/mariadb/handlers/main.yml b/playbooks/roles/mariadb/handlers/main.yml → ...playbooks/roles/mariadb/handlers/main.yml
diff --git a/playbooks/roles/mariadb/tasks/centos.yml → .../playbooks/roles/mariadb/tasks/centos.yml b/playbooks/roles/mariadb/tasks/centos.yml → .../playbooks/roles/mariadb/tasks/centos.yml
diff --git a/playbooks/roles/mariadb/tasks/debian.yml → .../playbooks/roles/mariadb/tasks/debian.yml b/playbooks/roles/mariadb/tasks/debian.yml → .../playbooks/roles/mariadb/tasks/debian.yml
diff --git a/playbooks/roles/mariadb/tasks/main.yml → bench/playbooks/roles/mariadb/tasks/main.yml b/playbooks/roles/mariadb/tasks/main.yml → bench/playbooks/roles/mariadb/tasks/main.yml
diff --git a/...riadb/tasks/mysql_secure_installation.yml → ...riadb/tasks/mysql_secure_installation.yml b/...riadb/tasks/mysql_secure_installation.yml → ...riadb/tasks/mysql_secure_installation.yml
diff --git a/...oks/roles/mariadb/tasks/ubuntu-trusty.yml → ...oks/roles/mariadb/tasks/ubuntu-trusty.yml b/...oks/roles/mariadb/tasks/ubuntu-trusty.yml → ...oks/roles/mariadb/tasks/ubuntu-trusty.yml
diff --git a/...es/mariadb/tasks/ubuntu-xenial_bionic.yml → ...es/mariadb/tasks/ubuntu-xenial_bionic.yml b/...es/mariadb/tasks/ubuntu-xenial_bionic.yml → ...es/mariadb/tasks/ubuntu-xenial_bionic.yml
diff --git a/.../mariadb/templates/mariadb_centos.repo.j2 → .../mariadb/templates/mariadb_centos.repo.j2 b/.../mariadb/templates/mariadb_centos.repo.j2 → .../mariadb/templates/mariadb_centos.repo.j2
diff --git a/.../mariadb/templates/mariadb_debian.list.j2 → .../mariadb/templates/mariadb_debian.list.j2 b/.../mariadb/templates/mariadb_debian.list.j2 → .../mariadb/templates/mariadb_debian.list.j2
diff --git a/.../mariadb/templates/mariadb_ubuntu.list.j2 → .../mariadb/templates/mariadb_ubuntu.list.j2 b/.../mariadb/templates/mariadb_ubuntu.list.j2 → .../mariadb/templates/mariadb_ubuntu.list.j2
diff --git a/playbooks/roles/mariadb/templates/my.cnf.j2 → ...aybooks/roles/mariadb/templates/my.cnf.j2 b/playbooks/roles/mariadb/templates/my.cnf.j2 → ...aybooks/roles/mariadb/templates/my.cnf.j2
diff --git a/playbooks/roles/mariadb/vars/main.yml → bench/playbooks/roles/mariadb/vars/main.yml b/playbooks/roles/mariadb/vars/main.yml → bench/playbooks/roles/mariadb/vars/main.yml
diff --git a/playbooks/roles/nginx/README.md → bench/playbooks/roles/nginx/README.md b/playbooks/roles/nginx/README.md → bench/playbooks/roles/nginx/README.md
diff --git a/playbooks/roles/nginx/defaults/main.yml → ...h/playbooks/roles/nginx/defaults/main.yml b/playbooks/roles/nginx/defaults/main.yml → ...h/playbooks/roles/nginx/defaults/main.yml
diff --git a/playbooks/roles/nginx/handlers/main.yml → ...h/playbooks/roles/nginx/handlers/main.yml b/playbooks/roles/nginx/handlers/main.yml → ...h/playbooks/roles/nginx/handlers/main.yml
diff --git a/playbooks/roles/nginx/meta/main.yml → bench/playbooks/roles/nginx/meta/main.yml b/playbooks/roles/nginx/meta/main.yml → bench/playbooks/roles/nginx/meta/main.yml
diff --git a/playbooks/roles/nginx/tasks/main.yml → bench/playbooks/roles/nginx/tasks/main.yml b/playbooks/roles/nginx/tasks/main.yml → bench/playbooks/roles/nginx/tasks/main.yml
diff --git a/playbooks/roles/nginx/tasks/setup-Debian.yml → ...ybooks/roles/nginx/tasks/setup-Debian.yml b/playbooks/roles/nginx/tasks/setup-Debian.yml → ...ybooks/roles/nginx/tasks/setup-Debian.yml
diff --git a/playbooks/roles/nginx/tasks/setup-RedHat.yml → ...ybooks/roles/nginx/tasks/setup-RedHat.yml b/playbooks/roles/nginx/tasks/setup-RedHat.yml → ...ybooks/roles/nginx/tasks/setup-RedHat.yml
diff --git a/playbooks/roles/nginx/tasks/vhosts.yml → bench/playbooks/roles/nginx/tasks/vhosts.yml b/playbooks/roles/nginx/tasks/vhosts.yml → bench/playbooks/roles/nginx/tasks/vhosts.yml
diff --git a/...books/roles/nginx/templates/nginx.conf.j2 → ...books/roles/nginx/templates/nginx.conf.j2 b/...books/roles/nginx/templates/nginx.conf.j2 → ...books/roles/nginx/templates/nginx.conf.j2
diff --git a/...books/roles/nginx/templates/nginx.repo.j2 → ...books/roles/nginx/templates/nginx.repo.j2 b/...books/roles/nginx/templates/nginx.repo.j2 → ...books/roles/nginx/templates/nginx.repo.j2
diff --git a/playbooks/roles/nginx/templates/vhosts.j2 → ...playbooks/roles/nginx/templates/vhosts.j2 b/playbooks/roles/nginx/templates/vhosts.j2 → ...playbooks/roles/nginx/templates/vhosts.j2
diff --git a/playbooks/roles/nginx/tests/inventory → bench/playbooks/roles/nginx/tests/inventory b/playbooks/roles/nginx/tests/inventory → bench/playbooks/roles/nginx/tests/inventory
diff --git a/playbooks/roles/nginx/tests/test.yml → bench/playbooks/roles/nginx/tests/test.yml b/playbooks/roles/nginx/tests/test.yml → bench/playbooks/roles/nginx/tests/test.yml
diff --git a/playbooks/roles/nginx/vars/Debian.yml → bench/playbooks/roles/nginx/vars/Debian.yml b/playbooks/roles/nginx/vars/Debian.yml → bench/playbooks/roles/nginx/vars/Debian.yml
diff --git a/playbooks/roles/nginx/vars/RedHat.yml → bench/playbooks/roles/nginx/vars/RedHat.yml b/playbooks/roles/nginx/vars/RedHat.yml → bench/playbooks/roles/nginx/vars/RedHat.yml
diff --git a/playbooks/roles/nodejs/defaults/main.yml → .../playbooks/roles/nodejs/defaults/main.yml b/playbooks/roles/nodejs/defaults/main.yml → .../playbooks/roles/nodejs/defaults/main.yml
diff --git a/...ooks/roles/nodejs/tasks/debian_family.yml → ...ooks/roles/nodejs/tasks/debian_family.yml b/...ooks/roles/nodejs/tasks/debian_family.yml → ...ooks/roles/nodejs/tasks/debian_family.yml
diff --git a/playbooks/roles/nodejs/tasks/main.yml → bench/playbooks/roles/nodejs/tasks/main.yml b/playbooks/roles/nodejs/tasks/main.yml → bench/playbooks/roles/nodejs/tasks/main.yml
diff --git a/...ooks/roles/nodejs/tasks/redhat_family.yml → ...ooks/roles/nodejs/tasks/redhat_family.yml b/...ooks/roles/nodejs/tasks/redhat_family.yml → ...ooks/roles/nodejs/tasks/redhat_family.yml
diff --git a/playbooks/roles/ntpd/tasks/main.yml → bench/playbooks/roles/ntpd/tasks/main.yml b/playbooks/roles/ntpd/tasks/main.yml → bench/playbooks/roles/ntpd/tasks/main.yml
diff --git a/...ooks/roles/packer/tasks/debian_family.yml → ...ooks/roles/packer/tasks/debian_family.yml b/...ooks/roles/packer/tasks/debian_family.yml → ...ooks/roles/packer/tasks/debian_family.yml
diff --git a/playbooks/roles/packer/tasks/main.yml → bench/playbooks/roles/packer/tasks/main.yml b/playbooks/roles/packer/tasks/main.yml → bench/playbooks/roles/packer/tasks/main.yml
diff --git a/...ooks/roles/packer/tasks/redhat_family.yml → ...ooks/roles/packer/tasks/redhat_family.yml b/...ooks/roles/packer/tasks/redhat_family.yml → ...ooks/roles/packer/tasks/redhat_family.yml
diff --git a/playbooks/roles/psutil/tasks/main.yml → bench/playbooks/roles/psutil/tasks/main.yml b/playbooks/roles/psutil/tasks/main.yml → bench/playbooks/roles/psutil/tasks/main.yml
diff --git a/playbooks/roles/redis/tasks/main.yml → bench/playbooks/roles/redis/tasks/main.yml b/playbooks/roles/redis/tasks/main.yml → bench/playbooks/roles/redis/tasks/main.yml
diff --git a/playbooks/roles/supervisor/tasks/main.yml → ...playbooks/roles/supervisor/tasks/main.yml b/playbooks/roles/supervisor/tasks/main.yml → ...playbooks/roles/supervisor/tasks/main.yml
diff --git a/playbooks/roles/swap/defaults/main.yml → bench/playbooks/roles/swap/defaults/main.yml b/playbooks/roles/swap/defaults/main.yml → bench/playbooks/roles/swap/defaults/main.yml
diff --git a/playbooks/roles/swap/tasks/main.yml → bench/playbooks/roles/swap/tasks/main.yml b/playbooks/roles/swap/tasks/main.yml → bench/playbooks/roles/swap/tasks/main.yml
diff --git a/playbooks/roles/virtualbox/defaults/main.yml → ...ybooks/roles/virtualbox/defaults/main.yml b/playbooks/roles/virtualbox/defaults/main.yml → ...ybooks/roles/virtualbox/defaults/main.yml
diff --git a/...s/virtualbox/files/virtualbox_centos.repo → ...s/virtualbox/files/virtualbox_centos.repo b/...s/virtualbox/files/virtualbox_centos.repo → ...s/virtualbox/files/virtualbox_centos.repo
diff --git a/.../roles/virtualbox/tasks/debian_family.yml → .../roles/virtualbox/tasks/debian_family.yml b/.../roles/virtualbox/tasks/debian_family.yml → .../roles/virtualbox/tasks/debian_family.yml
diff --git a/playbooks/roles/virtualbox/tasks/main.yml → ...playbooks/roles/virtualbox/tasks/main.yml b/playbooks/roles/virtualbox/tasks/main.yml → ...playbooks/roles/virtualbox/tasks/main.yml
diff --git a/.../roles/virtualbox/tasks/redhat_family.yml → .../roles/virtualbox/tasks/redhat_family.yml b/.../roles/virtualbox/tasks/redhat_family.yml → .../roles/virtualbox/tasks/redhat_family.yml
diff --git a/playbooks/roles/wkhtmltopdf/tasks/main.yml → ...laybooks/roles/wkhtmltopdf/tasks/main.yml b/playbooks/roles/wkhtmltopdf/tasks/main.yml → ...laybooks/roles/wkhtmltopdf/tasks/main.yml
diff --git a/playbooks/site.yml → bench/playbooks/site.yml b/playbooks/site.yml → bench/playbooks/site.yml
diff --git a/playbooks/vm_build.yml → bench/playbooks/vm_build.yml b/playbooks/vm_build.yml → bench/playbooks/vm_build.yml
diff --git a/bench/utils.py b/bench/utils.py
@@ -961,7 +961,7 @@ def run_playbook(playbook_name, extra_vars=None, tag=None):
 	if tag:
 		args.extend(['-t', tag])
 
-	subprocess.check_call(args, cwd=os.path.join(os.path.dirname(bench.__path__[0]), 'playbooks'))
+	subprocess.check_call(args, cwd=os.path.join(bench.__path__[0], 'playbooks'))
 
 
 def find_benches(directory=None):

diff --git a/setup.py b/setup.py
@@ -1,13 +1,16 @@
-from setuptools import setup, find_packages
-import re, ast
+import ast
+import os
+import re
 
-# get version from __version__ variable in bench/__init__.py
-_version_re = re.compile(r'__version__\s+=\s+(.*)')
+from setuptools import find_packages, setup
+
+playbooks_files = [os.path.join(dp, f) for dp, dn, filenames in os.walk("playbooks") for f in filenames]
 
 with open('requirements.txt') as f:
 	install_requires = f.read().strip().split('\n')
 
 with open('bench/__init__.py', 'rb') as f:
+	_version_re = re.compile(r'__version__\s+=\s+(.*)')
 	version = str(ast.literal_eval(_version_re.search(
 		f.read().decode('utf-8')).group(1)))
 
@@ -21,6 +24,7 @@
 	zip_safe=False,
 	include_package_data=True,
 	install_requires=install_requires,
+	package_data={ 'bench': playbooks_files },
 	entry_points='''
 [console_scripts]
 bench=bench.cli:cli