VladTheEnterprising 0.1.5 → 0.1.6

data/Rakefile

@@ -5,10 +5,6 @@ require 'hoe'
 require 'vlad'
 require 'highline/import'
 require './lib/vlad/enterprising.rb'
-require './lib/vlad/translator.rb'
-require './lib/vlad/environmentalist.rb'
-require './lib/vlad/dba/mysql.rb'
-require './lib/vlad/xen_master.rb'
 require './lib/nytd/builder'
 Hoe.new('VladTheEnterprising', VLAD_ENTERPRISING_VERSION) do |p|
   p.rubyforge_name = 'vlad_the_enterprising'

data/lib/vlad/dba/mysql.rb

@@ -3,8 +3,6 @@ require 'time'
 require 'highline/import'
 require 'monitor'
 require 'resolv'
-require 'vlad/translator'
-require 'vlad/environmentalist'
 require 'digest/md5'
 
 
@@ -21,11 +19,11 @@ namespace :vlad do
                                    :install_profile,
                                    :revoke_replication,
                                    :grant_replication,
-                                   :pre_bootstrap,
+                                   :pre_bootstrap_slave,
                                    :install_mysql,
                                    :configure_slaves,
                                    :dump_master,
-                                   :sync_slaves,
+                                   :slave_sync,
                                    :start_new_slaves,
                                    :check_slaves,]
 
@@ -70,8 +68,8 @@ namespace :vlad do
     task :assert_new_slaves do
       if ENV['BOOTSTRAP']
         host = ENV['BOOTSTRAP']
-        unless Rake::RemoteTask::hosts_for(:db_slave).include?(host)
-          raise "Error: '#{host}' not a :db_slave in target subset '#{target_environment}:#{target_subset}'"
+        unless Rake::RemoteTask::hosts_for(:new_slave).include?(host)
+          raise "Error: '#{host}' not a :new_slave in target subset '#{target_environment}:#{target_subset}'"
         end
         role :new_slave, ENV['BOOTSTRAP']
       end
@@ -86,7 +84,7 @@ namespace :vlad do
       end
     end
 
-    remote_task :install_profile, :roles => [:db_master, :db_slave, :config_holder, :new_slave, :slave_reset_candidate ] do
+    remote_task :install_profile, :roles => [:db_master, :db_slave, :config_holder, :new_slave,  ] do
       if File.exist?("files/mysql/bash_profile")
         `cat files/mysql/bash_profile | ssh #{target_host} "cat > .bash_profile"`
         run "if [ -e .bashrc ]; then rm .bashrc; fi; ln -s .bash_profile .bashrc"
@@ -122,7 +120,7 @@ namespace :vlad do
       slaves = Rake::RemoteTask.hosts_for(:new_slave)
       slaves.each do |slave|
         name = slave.gsub(/\..*$/,"").gsub(/-/, "")
-        mysql_query "REVOKE ALL PRIVILEGES, GRANT OPTION FROM #{name}_repl", "", :u => "root", :p => mysql_root_password, :force => true
+        mysql_query "REVOKE replication slave, super, reload FROM #{name}_repl", "", :u => "root", :p => mysql_root_password, :force => true
         mysql_query "drop user #{name}_repl", "", :u => "root", :p => mysql_root_password, :force => true
       end
     end
@@ -168,9 +166,14 @@ namespace :vlad do
       slaves.each do |hostname|
         name = hostname.gsub(/\..*$/,"").gsub(/-/, "")
         destfile =  "files/mysql/configs/#{name}.cnf"
-        template_file = "files/mysql/templates/#{name}.cnf.tmpl"
-        unless File.exist? template_file
-          template_file = "files/mysql/templates/db_slave.cnf.tmpl"
+        template_dir = "files/mysql/templates/"
+        template_file = ""
+        ["db_slave.cnf.tmpl",
+         "db_slave_#{os}.cnf.tmpl",
+         "#{name}.cnf.tmpl",
+        ].each do |t|
+          tt = "files/mysql/templates/#{t}"          
+          template_file = tt if File.exist?(tt)        
         end
         template =  File.read(template_file)
         server_id = Resolv.getaddress(hostname) + "-" + hostname
@@ -190,7 +193,7 @@ namespace :vlad do
       end
     end
 
-    remote_task :pre_bootstrap, :roles => [:new_slave] do
+    remote_task :pre_bootstrap_slave, :roles => [:new_slave] do
       mysql_slave_pre_bootstrap
     end
 
@@ -249,12 +252,13 @@ namespace :vlad do
       end
     end
 
-    remote_task :sync_slaves, :roles => :new_slave  do
+    remote_task :slave_sync, :roles => :new_slave  do
       mysql_dumpfile = ENV["DUMPFILE"] if ENV["DUMPFILE"]
       run "#{mysql_path_bin}/mysql -vvf -u root -e \"slave stop\;\";  exit 0"
       run "#{mysql_path_bin}/mysql -vvf -u root -e \"change master to master_host='#{mysql_master_host}', master_user='#{shortname}_repl', master_password='#{mysql_replication_password}';\""
       run "mkdir -p `dirname #{mysql_dumpfile}`"
-      scp mysql_dumpfile, mysql_dumpfile 
+      #puts "#{target_host}"
+      scp mysql_dumpfile, mysql_dumpfile
       run "cat #{mysql_dumpfile} | gunzip - | #{mysql_path_bin}/mysql -uroot"
       run "rm  #{mysql_dumpfile}"
     end
@@ -276,7 +280,7 @@ namespace :vlad do
     end
 
     desc "shows sync status of all slaves"
-    remote_task :check_slaves, :roles => :db_slave  do
+    remote_task :check_slaves, :roles => [:db_slave, :new_slave]  do
       begin
         assert_slave_running
       rescue Exception => e
@@ -310,12 +314,12 @@ namespace :vlad do
     end
 
     desc "stops replication on all slaves"
-    remote_task :stop_slaves, :roles => :db_slave do
+    remote_task :stop_slaves, :roles => [:db_slave, :new_slave] do
       mysql_query "slave stop;", "", :u => "root",  :p => mysql_root_password
     end
 
     desc "starts replication on all slaves"
-    remote_task :start_slaves, :roles => :db_slave do
+    remote_task :start_slaves, :roles => [:db_slave, :new_slave] do
       mysql_query "flush privileges; slave start;", "", :u => "root",  :p => mysql_root_password
     end
     desc "shows available databases"
@@ -325,7 +329,7 @@ namespace :vlad do
     end
     task :show_all_databases => [:ask_root_password]
 
-    remote_task :install_dot_my_cnf, :roles => :db_slave do
+    remote_task :install_dot_my_cnf, :roles => :new_slave do
       cnf = "[client]\n"
       cnf << "host     = localhost\n"
       cnf << "user     = root\n"
@@ -336,7 +340,7 @@ namespace :vlad do
       scp "/tmp/my.cnf.#{target_host}", ".my.cnf"
     end
 
-    remote_task :remove_dot_my_cnf, :roles => :db_slave do
+    remote_task :remove_dot_my_cnf, :roles => :new_slave do
       `rm /tmp/my.cnf.#{target_host}; exit 0`
       run "rm -f .my.cnf; exit 0"
     end

data/lib/vlad/enterprising.rb

@@ -2,9 +2,9 @@ require 'vlad'
 require 'vlad/translator'
 require 'vlad/environmentalist'
 require 'vlad/xen_master'
-require 'vlad/dba/mysql'
+require 'vlad/dba'
 require 'vlad/webmaster/apache'
-VLAD_ENTERPRISING_VERSION = '0.1.5' unless defined? VLAD_ENTERPRISING_VERSION
+VLAD_ENTERPRISING_VERSION = '0.1.6' unless defined? VLAD_ENTERPRISING_VERSION
 
 
 # rsync the given files to <tt>target_host</tt>.

data/lib/vlad/environmentalist.rb

@@ -10,23 +10,27 @@ namespace :vlad do
   end
 end
 
-if target
-  if target.to_s.match(/([a-z0-9_-]+):([a-z0-9_-]+)/i)
-    f = File.join( 'config', 'environments', "#{$1}.rb")
-    set(:target_environment, "#{$1}".to_sym)
-    Kernel.load f if File.exists? f
-    f = File.join('config', 'environments', "#{$1}", "#{$2}.rb")
-    set(:target_subset, "#{$2}".to_sym)
-    Kernel.load f if File.exists? f
-  elsif target.to_s.match(/([a-z0-9_-]+)/i)
-    f = File.join('config', 'environments', "#{$1}.rb")
-    set(:target_environment, $1.to_sym)
-    Kernel.load f if File.exists? f
-    all_files = Dir.glob( File.join( "config", "environments", $1, "*.rb") )
-    all_files.each do |f|
-      Kernel.load f
+unless defined? TARGET_PARSED
+  if target
+    if target.to_s.match(/([a-z0-9_-]+):([a-z0-9_-]+)/i)
+      f = File.join( 'config', 'environments', "#{$1}.rb")
+      set(:target_environment, "#{$1}".to_sym)
+      Kernel.load f if File.exists? f
+      f = File.join('config', 'environments', "#{$1}", "#{$2}.rb")
+      set(:target_subset, "#{$2}".to_sym)
+      Kernel.load f if File.exists? f
+    elsif target.to_s.match(/([a-z0-9_-]+)/i)
+      f = File.join('config', 'environments', "#{$1}.rb")
+      set(:target_environment, $1.to_sym)
+      Kernel.load f if File.exists? f
+      all_files = Dir.glob( File.join( "config", "environments", $1, "*.rb") )
+      all_files.each do |f|
+        Kernel.load f
+      end
     end
   end
+  TARGET_PARSED = true
 end
 
 
+

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: VladTheEnterprising
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 date: 2007-10-17 00:00:00 -04:00
 summary: Adds 'enterprisey' features to Vlad The Deployer
 require_paths: