Merge pull request #718 from codingCoffee/u18

feat(ubuntu 18): Add support for Ubuntu 18.04

playbooks/install.py

@@ -36,7 +36,7 @@ def install_bench(args):
 	# secure pip installation
 	if find_executable('pip'):
 		run_os_command({
-			'pip': 'sudo pip install --upgrade setuptools urllib3 requests cryptography pip'
+			'pip': 'sudo pip install --upgrade setuptools urllib3 cryptography pip'
 		})
 
 	else:
@@ -55,7 +55,7 @@ def install_bench(args):
 			})
 
 	success = run_os_command({
-		'pip': "sudo pip install --upgrade urllib3 requests cryptography ansible"
+		'pip': "sudo pip install --upgrade urllib3 cryptography ansible"
 	})
 
 	if not success:
@@ -129,7 +129,7 @@ def install_bench(args):
 		shutil.rmtree(tmp_bench_repo)
 
 def check_distribution_compatibility():
-	supported_dists = {'ubuntu': [14, 15, 16], 'debian': [8, 9],
+	supported_dists = {'ubuntu': [14, 15, 16, 18], 'debian': [8, 9],
 		'centos': [7], 'macos': [10.9, 10.10, 10.11, 10.12]}
 
 	dist_name, dist_version = get_distribution_info()

playbooks/roles/mariadb/tasks/main.yml

@@ -5,8 +5,8 @@
 - include: ubuntu-trusty.yml
   when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
 
-- include: ubuntu-xenial.yml
-  when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '16.04'
+- include: ubuntu-xenial_bionic.yml
+  when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int >= 16
 
 - name: Add configuration
   template: src={{ mysql_conf_tpl }} dest={{ mysql_conf_dir[ansible_distribution] }}/{{ mysql_conf_file }} owner=root group=root mode=0644