summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Alfonso <calfonso@redhat.com>2008-06-08 21:29:05 -0400
committerChris Alfonso <calfonso@redhat.com>2008-06-08 21:30:51 -0400
commit5cf1dfef025ec4db286e87ee8ed7d39493b11698 (patch)
tree466f643d7554e4b9fca7d436c7a3e54a04a9ef46
parent9a5aa44024c189f9f4903ae63a2b62ff0ca1bd2a (diff)
downloadpuppet-mysql-5cf1dfef025ec4db286e87ee8ed7d39493b11698.tar.gz
puppet-mysql-5cf1dfef025ec4db286e87ee8ed7d39493b11698.tar.xz
puppet-mysql-5cf1dfef025ec4db286e87ee8ed7d39493b11698.zip
Removing intranet custom datasource definition
-rw-r--r--manifests/init.pp1
-rw-r--r--manifests/intranet.pp80
2 files changed, 0 insertions, 81 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index a615eb5..fc33154 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -4,7 +4,6 @@
import "variables.pp"
import "passwords"
-import "intranet"
class mysql::server {
include passwords
diff --git a/manifests/intranet.pp b/manifests/intranet.pp
deleted file mode 100644
index 43b5c8f..0000000
--- a/manifests/intranet.pp
+++ /dev/null
@@ -1,80 +0,0 @@
-define mysql::clearspace::datasource($rootpw, $ds_name, $ds_owner, $ds_owner_pwd, $ds_user, $ds_user_pwd, $ds_schema, mysql_replication_user, mysql_replication_password, mysql_root_database, mysql_root_local_host) {
- case $mysql_type {
- standalone: {
- $mysql_root_cmd = "/usr/bin/mysql --user=root --password=$rootpw "
-
- exec { "create datasource $ds_name":
- command => "/usr/bin/mysqladmin -u root -p$rootpw create $ds_name",
- unless => "$mysql_root_cmd $ds_name --execute='\s'",
- require => [Service["mysql"], Exec["restart mysql server"]],
- }
-
- exec { "create grants $ds_name":
- command => "$mysql_root_cmd --database=$mysql_root_database --execute=\"GRANT ALL PRIVILEGES ON *.* TO '$ds_owner'@'%' IDENTIFIED BY '$ds_owner_pwd' WITH GRANT OPTION;\"",
- unless => "/usr/bin/mysql --host=$ipaddress --user=$ds_owner --password=$ds_owner_pwd --database=$mysql_root_database --execute='\s'",
- require => Exec["create datasource $ds_name"],
- }
-
- exec { "create grants $ds_user":
- command => "$mysql_root_cmd --database=$mysql_root_database --execute=\"GRANT ALL PRIVILEGES ON $ds_name.* TO '$ds_user'@'%' IDENTIFIED BY '$ds_user_pwd';\"",
- unless => "/usr/bin/mysql --host=$ipaddress --user=$ds_user --password=$ds_user_pwd --database=$mysql_root_database --execute='\s'",
- require => Exec["create grants $ds_name"],
- }
-
- # Only create the schema is a template directory was specified
- if $ds_schema {
- exec { "create db $ds_name":
- command => "$mysql_root_cmd $ds_name < $ds_schema > /var/lib/mysql/${ds_name}-create-db.log",
- creates => "/var/lib/mysql/${ds_name}-create-db.log",
- onlyif => "$mysql_root_cmd --database=$mysql_root_database --execute='\s'",
- require => Exec["create grants $ds_user"],
- }
- }
-
- }
- primary-master: {
- $mysql_root_cmd ="/usr/bin/mysql --user=root --password=$rootpw "
- $mysql_cmd_repl_slave ="/usr/bin/mysql --user=$mysql_replication_user --database=$mysql_root_database --host=$mysql_master_ip_address --password=$mysql_replication_password"
-
- file { "/var/lib/mysql/${ds_name}_verify_slave_configuration.bash":
- ensure => present,
- owner => "mysql",
- group => "mysql",
- mode => 0755,
- content => template("mysql/verify_slave_configuration.bash.erb"),
- require => [Service["mysql"], Exec["restart slave server"]],
- }
-
- exec { "create datasource $ds_name":
- command => "/usr/bin/mysqladmin -u root -p$rootpw create $ds_name",
- onlyif => "/var/lib/mysql/${ds_name}_verify_slave_configuration.bash",
- require => File["/var/lib/mysql/${ds_name}_verify_slave_configuration.bash"],
- }
-
- exec { "create all grants $ds_name":
- command => "$mysql_root_cmd --database=$mysql_root_database --execute=\"GRANT ALL PRIVILEGES ON *.* TO '$ds_owner'@'%' IDENTIFIED BY '$ds_owner_pwd' WITH GRANT OPTION;\"",
- creates => "/var/lib/mysql/'$ds_name'-all-grants-created.out",
- unless => "$mysql_cmd_repl_slave --execute=\"select user from user;\" | grep '$ds_owner'",
- require => Exec["create datasource $ds_name"],
- }
-
- exec { "create select grants $ds_user":
- command => "$mysql_root_cmd --database=$mysql_root_database --execute=\"GRANT CREATE,SELECT,INSERT,UPDATE,DELETE ON $ds_name.* TO '$ds_user'@'%' IDENTIFIED BY '$ds_user_pwd';\"",
- creates => "/var/lib/mysql/'$ds_name'-select-grants-created.out",
- unless => "$mysql_cmd_repl_slave --execute=\"select user from user;\" | grep '$ds_user'",
- require => Exec["create all grants $ds_name"],
- }
-
- # Only create the schema is a template directory was specified
- if $ds_schema {
- exec { "create db schema $ds_name":
- command => "$mysql_root_cmd --database=$ds_name < $ds_schema > /var/lib/mysql/${ds_name}-create-db.log",
- creates => "/var/lib/mysql/${ds_name}-create-db.log",
- onlyif => "$mysql_root_cmd --database=$mysql_root_database --execute='\s'",
- require => Exec["create select grants $ds_user"],
- }
- }
-
- }
- }
-}