Merge pull request #31 from jordiprats/master

percona repo related fixes

.travis.yml

@@ -23,18 +23,8 @@ matrix:
     dist: trusty
     bundler_args:
     script: bundle exec rake validate
-  - rvm: default
-    env: BEAKER_set="centos6-docker"
-    dist: trusty
-    bundler_args:
-    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     env: BEAKER_set="centos7-docker"
     dist: trusty
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
-  - rvm: default
-    env: BEAKER_set="ubuntu16-docker"
-    dist: trusty
-    bundler_args:
-    script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 0.4.18
+
+* xtrabackup install needs to happen after mysql deployment
+* added GPG for Percona: RPM-GPG-KEY-Percona
+
 ## 0.4.17
 
 * Added option to handle extra options for mysqldump

examples/mysqldump_extraopts.pp

@@ -7,5 +7,5 @@
 
 mysql::backup::mysqldump { 'test':
   destination => '/backup',
-  extraopts => '--quick',
+  extraopts   => '--quick',
 }

files/percona/GPG-key-percona

@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+mQGiBEsm3aERBACyB1E9ixebIMRGtmD45c6c/wi2IVIa6O3G1f6cyHH4ump6ejOi
+AX63hhEs4MUCGO7KnON1hpjuNN7MQZtGTJC0iX97X2Mk+IwB1KmBYN9sS/OqhA5C
+itj2RAkug4PFHR9dy21v0flj66KjBS3GpuOadpcrZ/k0g7Zi6t7kDWV0hwCgxCa2
+f/ESC2MN3q3j9hfMTBhhDCsD/3+iOxtDAUlPMIH50MdK5yqagdj8V/sxaHJ5u/zw
+YQunRlhB9f9QUFfhfnjRn8wjeYasMARDctCde5nbx3Pc+nRIXoB4D1Z1ZxRzR/lb
+7S4i8KRr9xhommFnDv/egkx+7X1aFp1f2wN2DQ4ecGF4EAAVHwFz8H4eQgsbLsa6
+7DV3BACj1cBwCf8tckWsvFtQfCP4CiBB50Ku49MU2Nfwq7durfIiePF4IIYRDZgg
+kHKSfP3oUZBGJx00BujtTobERraaV7lIRIwETZao76MqGt9K1uIqw4NT/jAbi9ce
+rFaOmAkaujbcB11HYIyjtkAGq9mXxaVqCC3RPWGr+fqAx/akBLQ2UGVyY29uYSBN
+eVNRTCBEZXZlbG9wbWVudCBUZWFtIDxteXNxbC1kZXZAcGVyY29uYS5jb20+iGAE
+ExECACAFAksm3aECGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAcTL3NzS79
+Kpk/AKCQKSEgwX9r8jR+6tAnCVpzyUFOQwCfX+fw3OAoYeFZB3eu2oT8OBTiVYu5
+Ag0ESybdoRAIAKKUV8rbqlB8qwZdWlmrwQqg3o7OpoAJ53/QOIySDmqy5TmNEPLm
+lHkwGqEqfbFYoTbOCEEJi2yFLg9UJCSBM/sfPaqb2jGP7fc0nZBgUBnFuA9USX72
+O0PzVAF7rCnWaIz76iY+AMI6xKeRy91TxYo/yenF1nRSJ+rExwlPcHgI685GNuFG
+chAExMTgbnoPx1ka1Vqbe6iza+FnJq3f4p9luGbZdSParGdlKhGqvVUJ3FLeLTqt
+caOn5cN2ZsdakE07GzdSktVtdYPT5BNMKgOAxhXKy11IPLj2Z5C33iVYSXjpTelJ
+b2qHvcg9XDMhmYJyE3O4AWFh2no3Jf4ypIcABA0IAJO8ms9ov6bFqFTqA0UW2gWQ
+cKFN4Q6NPV6IW0rV61ONLUc0VFXvYDtwsRbUmUYkB/L/R9fHj4lRUDbGEQrLCoE+
+/HyYvr2rxP94PT6Bkjk/aiCCPAKZRj5CFUKRpShfDIiow9qxtqv7yVd514Qqmjb4
+eEihtcjltGAoS54+6C3lbjrHUQhLwPGqlAh8uZKzfSZq0C06kTxiEqsG6VDDYWy6
+L7qaMwOqWdQtdekKiCk8w/FoovsMYED2qlWEt0i52G+0CjoRFx2zNsN3v4dWiIhk
+ZSL00Mx+g3NA7pQ1Yo5Vhok034mP8L2fBLhhWaK3LG63jYvd0HLkUFhNG+xjkpeI
+SQQYEQIACQUCSybdoQIbDAAKCRAcTL3NzS79KlacAJ0aAkBQapIaHNvmAhtVjLPN
+wke4ZgCePe3sPPF49lBal7QaYPdjqapa1SQ=
+=qcCk
+-----END PGP PUBLIC KEY BLOCK-----

manifests/backup/xtrabackup.pp

@@ -79,6 +79,7 @@
   #
   if(!defined(Class['mysql::backup::xtrabackup::install']))
   {
+    Service <| tag == 'mysqlservice' |> ->
     class { 'mysql::backup::xtrabackup::install':
       version => $xtrabackup_version,
     }

manifests/community/service.pp

@@ -18,6 +18,7 @@
       service { "mysqlcommunity@${instance_name}":
         ensure => $service_ensure,
         enable => $service_enable,
+        tag    => 'mysqlservice',
       }
     }
   }

manifests/perconarepo.pp

@@ -7,6 +7,23 @@
     path => '/usr/sbin:/usr/bin:/sbin:/bin',
   }
 
+  $percona_gpg_path='/etc/pki/rpm-gpg/RPM-GPG-KEY-Percona'
+
+  file { $percona_gpg_path:
+    ensure  => 'present',
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => file("${module_name}/percona/GPG-key-percona"),
+  }
+
+  exec { 'import-percona-gpg':
+    command => "rpm --import ${percona_gpg_path}",
+    path    => ['/bin', '/usr/bin'],
+    unless  => "rpm -q gpg-pubkey-$(gpg --throw-keyids ${percona_gpg_path} | grep pub | cut -c 12-19 | tr '[A-Z]' '[a-z]')",
+    require => File[$percona_gpg_path],
+  }
+
   exec { "mysql perconarepo srcdir ${srcdir}":
     command => "mkdir -p ${srcdir}",
     creates => $srcdir,
@@ -28,7 +45,7 @@
     ensure   => $package_ensure,
     provider => $mysql::params::package_provider,
     source   => "${srcdir}/repo_perconarepo.${mysql::params::package_provider}",
-    require  => Exec['wget perconarepo'],
+    require  => Exec[['wget perconarepo','import-percona-gpg']],
     notify   => Exec['perconarepo install update'],
   }
 

manifests/xtradbcluster/service.pp

@@ -17,6 +17,7 @@
       service { "xtradbcluster@${instance_name}":
         ensure => $service_ensure,
         enable => $service_enable,
+        tag    => 'mysqlservice',
       }
     }
   }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "eyp-mysql",
-  "version": "0.4.17",
+  "version": "0.4.18",
   "author": "eyp",
   "summary": "multi instance mysql community and Percona XtraDB cluster (galera)",
   "license": "Apache-2.0",

spec/acceptance/community_instance_mysqldump_spec.rb

@@ -51,7 +51,7 @@
       its(:content) { should match '[mysqld]' }
     end
 
-    describe file("/etc/mysql/test/my.cnf") do
+    describe file("/etc/mysql/test_mysqldump/my.cnf") do
       it { should be_file }
       its(:content) { should match '[mysqld]' }
     end

spec/acceptance/community_instance_xtrabackup_spec.rb

@@ -25,18 +25,21 @@
       pp = <<-EOF
 
       mysql::community::instance { 'test_xtrabackup':
-    		port              => '3308',
+    		port              => '3408',
     		password          => 'password',
     		add_default_mycnf => true,
     		default_instance  => true,
     	}
 
-      ->
-
       mysql::backup::xtrabackup { 'test_xtrabackup':
         destination => '/backup',
       }
 
+      mysql_database { 'et2blog':
+        ensure        => 'present',
+        instance_name => 'test_xtrabackup',
+      }
+
       EOF
 
       # Run it twice and test for idempotency
@@ -50,7 +53,7 @@
     end
 
     it "check db and mysql access" do
-      expect(shell("echo show databases | mysql | grep et2blog").exit_code).to be_zero
+      expect(shell("echo show databases | mysql --defaults-group-suffix=test_xtrabackup | grep et2blog").exit_code).to be_zero
     end
 
     #instance tomcat-8080 HTTP connector
@@ -63,7 +66,7 @@
       its(:content) { should match '[mysqld]' }
     end
 
-    describe file("/etc/mysql/test/my.cnf") do
+    describe file("/etc/mysql/test_xtrabackup/my.cnf") do
       it { should be_file }
       its(:content) { should match '[mysqld]' }
     end