Skip to content

Commit

Permalink
- completely reviewed the puppet code (task not yet completed)
Browse files Browse the repository at this point in the history
- add package of galera load balancer (glb), no manifest yet

TODO:
- test Percona Server installation instead of Percona Cluster
- test xtrabackup and tookit manifests and review/rewrite them
- add manifest for glb

Signed-off-by: Frederic -lefred- Descamps <frederic.descamps@percona.com>
  • Loading branch information
Frederic -lefred- Descamps committed Apr 11, 2012
1 parent 6051ef7 commit 0010346
Show file tree
Hide file tree
Showing 18 changed files with 110 additions and 211 deletions.
5 changes: 2 additions & 3 deletions Vagrantfile
Expand Up @@ -8,7 +8,6 @@ Vagrant::Config.run do |config|
percona1_config.vm.box = "centos6"
percona1_config.vm.host_name = "percona1"
percona1_config.ssh.max_tries = 100
#percona1_config.vm.network("192.168.70.2")
#percona1_config.vm.boot_mode = :gui
percona1_config.vm.customize ["modifyvm", :id, "--memory", "256"]
percona1_config.vm.network :hostonly, "192.168.70.2"
Expand All @@ -24,9 +23,9 @@ Vagrant::Config.run do |config|
percona2_config.vm.box = "centos6"
percona2_config.vm.host_name = "percona2"
percona2_config.ssh.max_tries = 100
#percona2_config.vm.network("192.168.70.2")
#percona2_config.vm.boot_mode = :gui
percona2_config.vm.customize ["modifyvm", :id, "--memory", "256"]
percona2_config.vm.network :hostonly, "192.168.70.3"
percona2_config.vm.provision :puppet do |percona2_puppet|
percona2_puppet.pp_path = "/tmp/vagrant-puppet"
percona2_puppet.manifests_path = "manifests"
Expand All @@ -39,9 +38,9 @@ Vagrant::Config.run do |config|
percona3_config.vm.box = "centos6"
percona3_config.vm.host_name = "percona3"
percona3_config.ssh.max_tries = 100
#percona3_config.vm.network("192.168.70.2")
#percona3_config.vm.boot_mode = :gui
percona3_config.vm.customize ["modifyvm", :id, "--memory", "256"]
percona3_config.vm.network :hostonly, "192.168.70.4"
percona3_config.vm.provision :puppet do |percona3_puppet|
percona3_puppet.pp_path = "/tmp/vagrant-puppet"
percona3_puppet.manifests_path = "manifests"
Expand Down
58 changes: 13 additions & 45 deletions manifests/site.pp
@@ -1,65 +1,33 @@
node percona1 {
include percona::repository
include percona-testing::repository
include percona-testing::packages
include percona-testing::service
include percona::cluster::packages
include percona::cluster::service
include myhosts
$extraipaddr="192.168.70.2"
network::if {
"eth3":
ip_add => $extraipaddr,
ip_netmask => "255.255.255.0",
ip_network => "192.168.70.0",
broadcast => "192.168.70.255",
proto => "static",
}

Class['percona::repository'] -> Class['percona-testing::repository'] -> Class['percona-testing::packages'] -> Class['percona-testing::config'] -> Class['percona-testing::service']
Class['percona::repository'] -> Class['percona::cluster::packages'] -> Class['percona::cluster::config'] -> Class['percona::cluster::service']

class {'percona-testing::config': extraipaddr => $extraipaddr}
class {'percona::cluster::config': extraipaddr => $ipaddress_eth1 }
}

node percona2 {
include percona::repository
include percona-testing::repository
include percona-testing::packages
include percona-testing::service
include percona::cluster::packages
include percona::cluster::service
include myhosts
#include testdb::employee

$extraipaddr="192.168.70.3"
network::if {
"eth3":
ip_add => $extraipaddr,
ip_netmask => "255.255.255.0",
ip_network => "192.168.70.0",
broadcast => "192.168.70.255",
proto => "static",
}
Class['percona::repository'] -> Class['percona::cluster::packages'] -> Class['percona::cluster::config'] -> Class['percona::cluster::service']

Class['percona::repository'] -> Class['percona-testing::repository'] -> Class['percona-testing::packages'] -> Class['percona-testing::config'] -> Class['percona-testing::service']

class {'percona-testing::config': extraipaddr => $extraipaddr}
class {'percona::cluster::config': extraipaddr => $ipaddress_eth1 }
}

node percona3 {
include percona::repository
include percona-testing::repository
include percona-testing::packages
include percona-testing::service
include percona::cluster::packages
include percona::cluster::service
include myhosts

$extraipaddr="192.168.70.4"
network::if {
"eth3":
ip_add => $extraipaddr,
ip_netmask => "255.255.255.0",
ip_network => "192.168.70.0",
broadcast => "192.168.70.255",
proto => "static",
}

Class['percona::repository'] -> Class['percona-testing::repository'] -> Class['percona-testing::packages'] -> Class['percona-testing::config'] -> Class['percona-testing::service']
Class['percona::repository'] -> Class['percona::cluster::packages'] -> Class['percona::cluster::config'] -> Class['percona::cluster::service']

class {'percona-testing::config': extraipaddr => $extraipaddr}
class {'percona::cluster::config': extraipaddr => $ipaddress_eth1 }
}

Binary file added modules/galera/files/glb-0.7.4-3.0.x86_64.rpm
Binary file not shown.
24 changes: 0 additions & 24 deletions modules/network/manifests/if.pp

This file was deleted.

9 changes: 0 additions & 9 deletions modules/network/templates/ifcfg-device.erb

This file was deleted.

1 change: 0 additions & 1 deletion modules/network/templates/route-device.erb

This file was deleted.

64 changes: 0 additions & 64 deletions modules/percona-testing/manifests/init.pp

This file was deleted.

Binary file not shown.
Binary file added modules/percona/files/percona-cluster-galera.pp
Binary file not shown.
File renamed without changes.
21 changes: 21 additions & 0 deletions modules/percona/manifests/cluster/config.pp
@@ -0,0 +1,21 @@
class percona::cluster::config ($extraipaddr=undef) {

if $hostname == "percona1" {
$joinip = " "
} else {
$joinip = "192.168.70.2"
}
file {
"/etc/my.cnf":
ensure => present,
content => template("percona/cluster/my.cnf.erb"),
}

exec {
"disable-selinux":
path => ["/usr/bin","/bin"],
command => "echo 0 >/selinux/enforce",
unless => "grep 0 /selinux/enforce",
}

}
21 changes: 21 additions & 0 deletions modules/percona/manifests/cluster/packages.pp
@@ -0,0 +1,21 @@
class percona::cluster::packages {

package {
"Percona-XtraDB-Cluster-server.$hardwaremodel":
alias => "MySQL-server",
require => [ Yumrepo['percona'], Package['MySQL-client'] ],
ensure => "installed";
"Percona-XtraDB-Cluster-client.$hardwaremodel":
alias => "MySQL-client",
require => Yumrepo['percona'],
ensure => "installed";
"rsync":
ensure => "present";
"mysql-libs":
ensure => "absent";
"Percona-Server-shared-compat":
require => [ Yumrepo['percona'], Package['mysql-libs'], Package['MySQL-client'] ],
ensure => "installed";

}
}
10 changes: 10 additions & 0 deletions modules/percona/manifests/cluster/service.pp
@@ -0,0 +1,10 @@
class percona::cluster::service ($ensure="running") {

service {
"mysql":
enable => true,
ensure => $ensure,
subscribe => File['/etc/my.cnf'],
require => Package['MySQL-server'],
}
}
65 changes: 0 additions & 65 deletions modules/percona/manifests/init.pp

This file was deleted.

14 changes: 14 additions & 0 deletions modules/percona/manifests/repository.pp
@@ -0,0 +1,14 @@
class percona::repository {


$releasever = "6"
$basearch = $hardwaremodel
yumrepo {
"percona":
descr => "Percona",
enabled => 1,
baseurl => "http://repo.percona.com/centos/$releasever/os/$basearch/",
gpgcheck => 0;
}

}
18 changes: 18 additions & 0 deletions modules/percona/manifests/server/packages.pp
@@ -0,0 +1,18 @@
class percona::server::packages {

package {
"Percona-Server-server-55.$hardwaremodel":
alias => "MySQL-server",
require => Yumrepo['percona'],
ensure => "installed";
"Percona-Server-client-55.$hardwaremodel":
alias => "MySQL-client",
require => Yumrepo['percona'],
ensure => "installed";
"mysql-libs":
ensure => "absent";
"Percona-Server-shared-compat":
require => [ Yumrepo['percona'], Package['mysql-libs'], Package['MySQL-client'] ],
ensure => "installed";
}
}
11 changes: 11 additions & 0 deletions modules/percona/manifests/server/service.pp
@@ -0,0 +1,11 @@
class percona::server::service ($ensure="running") {


service {
"mysql":
enable => true,
ensure => $ensure,
require => Package['MySQL-server'],
}

}

0 comments on commit 0010346

Please sign in to comment.