Support Ubuntu 18.04 with proxysql 2.0

.sync.yml

@@ -4,6 +4,7 @@
   docker_sets:
     - set: ubuntu1404-64
     - set: ubuntu1604-64
+    - set: ubuntu1804-64
     - set: centos6-64
     - set: centos7-64
     - set: debian8-64

.travis.yml

@@ -39,6 +39,14 @@ matrix:
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1604-64 BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
+  - rvm: 2.5.3
+    bundler_args: --without development release
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=ubuntu1804-64 BEAKER_HYPERVISOR=docker CHECK=beaker
+    services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos6-64 BEAKER_HYPERVISOR=docker CHECK=beaker

manifests/init.pp

@@ -85,7 +85,7 @@
 #   Defaults to the official upstream repo for your OS. See http://repo.proxysql.com for more info.
 #
 # * `repo_version`
-#   Specifies the repo version of ProxySQL to be configured. Defaults to '1.4.x'.
+#   Specifies the repo version of ProxySQL to be configured. Defaults to '1.4.x' ('2.0.x' for Ubuntu 18.04).
 #
 # * `package_source`
 #   location ot the proxysql package for the `package_provider`.
@@ -189,7 +189,7 @@
 
   Boolean $manage_repo = true,
   Hash $repo = $proxysql::params::repo14,
-  Enum['2.0.x','1.4.x']  $repo_version = '1.4.x',
+  Enum['2.0.x','1.4.x']  $repo_version = $proxysql::params::repo_version,
 
   String $package_source = $proxysql::params::package_source,
   String $package_checksum_value = $proxysql::params::package_checksum_value,

manifests/params.pp

@@ -14,16 +14,13 @@
 
   $listen_ip     = '0.0.0.0'
   $listen_port   = 6033
-  $listen_socket = '/tmp/proxysql.sock'
 
   $admin_username      = 'admin'
   $admin_password      = Sensitive('admin')
   $admin_listen_ip     = '127.0.0.1'
   $admin_listen_port   = 6032
 
-  $admin_listen_socket = '/tmp/proxysql_admin.sock'
-  $sys_owner           = 'root'
-  $sys_group           = 'root'
+  $datadir = '/var/lib/proxysql'
 
   case $facts['os']['family'] {
     'Debian': {
@@ -66,10 +63,17 @@
               $package_dependencies = []
             }
             '18.04': {
-              # no upstream bionic builds are provided yet.
-              $package_source = undef
-              $package_checksum_value = undef
-              $package_checksum_type = undef
+              $_repo_version = '2.0.x'
+              $_sys_owner   = 'proxysql'
+              $_sys_group   = 'proxysql'
+
+              # The 2.0.x systemd service file in ubuntu 18.04 has `ReadWritePaths=/var/lib/proxysql /var/run/proxysql`.
+              # This limits where we can write sockets.
+              $_listen_socket = "${datadir}/proxysql.sock"
+              $_admin_listen_socket = "${datadir}/proxysql_admin.sock"
+              $package_source = 'https://github.com/sysown/proxysql/releases/download/v2.0.4/proxysql_2.0.4-ubuntu18_amd64.deb'
+              $package_checksum_value = '397e7244663d8e15134d788e918d9d75c0802b5a'
+              $package_checksum_type = 'sha1'
               $package_dependencies = []
             }
             default: {
@@ -129,10 +133,15 @@
     }
   }
 
+  $sys_owner = pick(getvar('_sys_owner'),'root')
+  $sys_group = pick(getvar('_sys_group'),'root')
+  $repo_version = pick(getvar('_repo_version'),'1.4.x')
+  $listen_socket = pick(getvar('_listen_socket'),'/tmp/proxysql.sock')
+  $admin_listen_socket = pick(getvar('_admin_listen_socket'),'/tmp/proxysql_admin.sock')
+
   $monitor_username = 'monitor'
   $monitor_password = Sensitive('monitor')
 
-  $datadir = '/var/lib/proxysql'
 
   $split_config             = false
   $config_file              = '/etc/proxysql.cnf'

metadata.json

@@ -63,7 +63,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     }
   ],

spec/classes/proxysql_spec.rb

@@ -34,8 +34,15 @@
                                                             install_options: [])
           end
 
-          let(:sys_user) { 'root' }
-          let(:sys_group) { 'root' }
+          if facts[:operatingsystemrelease] == '18.04'
+            sys_user = 'proxysql'
+            sys_group = 'proxysql'
+            admin_socket = '/var/lib/proxysql/proxysql_admin.sock'
+          else
+            sys_user = 'root'
+            sys_group = 'root'
+            admin_socket = '/tmp/proxysql_admin.sock'
+          end
 
           it do
             is_expected.to contain_file('proxysql-config-file').with(ensure: 'file',
@@ -70,8 +77,8 @@
 
           it do
             is_expected.to contain_exec('wait_for_admin_socket_to_open').with(
-              command:   'test -S /tmp/proxysql_admin.sock',
-              unless:    'test -S /tmp/proxysql_admin.sock',
+              command:   "test -S #{admin_socket}",
+              unless:    "test -S #{admin_socket}",
               tries:     3,
               try_sleep: 10,
               require:   'Service[proxysql]',