chef_backup 0.0.1.dev.3 → 0.0.1.dev.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09b1eb6deacbd6c56ebe568a9f35f901dc84fd44
-  data.tar.gz: 9d46e9ecc8b151b30f84b10ec1b87967d59ed1cf
+  metadata.gz: 94cbd6726cb86fe838709bb6cd0102f18ff98a02
+  data.tar.gz: 7a38dd28ef497ae4b1ec8a59adb22634e28f2fc4
 SHA512:
-  metadata.gz: fc18b6429543be51b9181a7f41824884729827d4d3b2ff1b9590b0798ee63c4a354af3c55fc87750b643fc4da114884feb7572554e754450b256bffe794482cc
-  data.tar.gz: e91dc44182e140a32685ac618ebc5a129b648fa1c2a953529da9c476d579b19df5a6ec7cfc305df224a53d823cf18f75caf0d6fb3c2a8de3d2a5ca31df6aa324
+  metadata.gz: 4f1c58f55e246331ab7cc8c9919f6e9dafaba9922d4c597e5546bd59701634e3766461d4e58f3efffcea09cf1267724e52d3f11b4b9fc6b37be68eecdc1664b4
+  data.tar.gz: af600e295428765fb2e8bd0316039108a1133c5fd7a82ea8df83b1c518019c965a4239935cc9625010522b2bc82ff23aab588ab4afc9f0f24e06a0ebac846478

data/.rubocop.yml

@@ -2,8 +2,12 @@ Style/ClassAndModuleChildren:
   Enabled: false
 Style/GuardClause:
   Enabled: false
+Metrics/LineLength:
+  Max: 120
 Metrics/ClassLength:
   Max: 200
+Metrics/ModuleLength:
+  Max: 200
 Metrics/CyclomaticComplexity:
   Max: 10
 Metrics/PerceivedComplexity:
@@ -11,7 +15,7 @@ Metrics/PerceivedComplexity:
 Metrics/MethodLength:
   Max: 40
 Metrics/AbcSize:
-  Max: 30
+  Max: 40
 AllCops:
   Exclude:
     - 'Guardfile'

data/chef_backup.gemspec

@@ -28,6 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'guard-rspec'
   spec.add_development_dependency 'pry-rescue'
-  spec.add_development_dependency 'rubocop', '>= 0.28'
+  spec.add_development_dependency 'rubocop', '>= 0.32.1'
   spec.add_development_dependency 'simplecov'
 end

data/lib/chef_backup/data_map.rb

@@ -11,15 +11,17 @@ module ChefBackup
       attr_writer :data_map
     end
 
-    attr_accessor :strategy, :backup_time, :configs, :services
+    attr_accessor :strategy, :backup_time, :topology, :configs, :services, :ha
 
     def initialize
       @services = {}
       @configs = {}
+      @ha = {}
       yield self if block_given?
 
       @backup_time ||= Time.now.iso8601
       @strategy ||= 'none'
+      @toplogy ||= 'idontknow'
     end
 
     def add_service(service, data_dir)
@@ -32,10 +34,16 @@ module ChefBackup
       @configs[config]['data_dir'] = path
     end
 
+    def add_ha_info(k, v)
+      @ha[k] = v
+    end
+
     def manifest
       {
         'strategy' => strategy,
         'backup_time' => backup_time,
+        'topology' => topology,
+        'ha' => ha,
         'services' => services,
         'configs' => configs
       }

data/lib/chef_backup/helpers.rb

@@ -104,18 +104,34 @@ module Helpers
     private_chef['backup']['strategy']
   end
 
+  def topology
+    private_chef['topology']
+  end
+
   def frontend?
     private_chef['role'] == 'frontend'
   end
 
   def backend?
-    private_chef['role'] =~  /backend|standalone/
+    private_chef['role'] =~ /backend|standalone/
   end
 
   def online?
     private_chef['backup']['mode'] == 'online'
   end
 
+  def ha?
+    topology == 'ha'
+  end
+
+  def tier?
+    topology == 'tier'
+  end
+
+  def standalone?
+    topology == 'standalone'
+  end
+
   def tmp_dir
     @tmp_dir ||= begin
       dir = safe_key { config['tmp_dir'] } ||

data/lib/chef_backup/strategy/backup/tar.rb

@@ -75,6 +75,12 @@ class TarBackup
     if private_chef.key?('upgrades')
       data_map.add_service('upgrades', private_chef['upgrades']['dir'])
     end
+
+    if ha?
+      data_map.add_service('keepalived', private_chef['keepalived']['dir'])
+      data_map.add_ha_info('provider', private_chef['ha']['provider'])
+      data_map.add_ha_info('path', private_chef['ha']['path'])
+    end
   end
 
   def manifest
@@ -111,6 +117,7 @@ class TarBackup
     @data_map ||= ChefBackup::DataMap.new do |data|
       data.backup_time = backup_time
       data.strategy = strategy
+      data.topology = topology
     end
   end
 

data/lib/chef_backup/strategy/restore/tar.rb

@@ -26,6 +26,12 @@ class TarRestore
   def restore
     log 'Restoring Chef Server from backup'
     cleanse_chef_server(config['agree_to_cleanse'])
+    if manifest['topology'] == 'ha'
+      log 'Performing HA restore - please ensure that keepalived is not running on the standby host'
+      fix_ha_plugins
+      check_ha_volume
+      touch_drbd_ready
+    end
     restore_configs
     restore_services unless frontend?
     touch_sentinel
@@ -102,6 +108,35 @@ class TarRestore
     @backup_name ||= Pathname.new(tarball_path).basename.sub_ext('').to_s
   end
 
+  def fix_ha_plugins
+    log 'Fixing HA plugins directory (https://github.com/chef/chef-server/issues/115)'
+    plugins_dir = '/var/opt/opscode/plugins'
+    drbd_plugin = File.join(plugins_dir, 'chef-ha-drbd.rb')
+
+    FileUtils.mkdir_p(plugins_dir) unless Dir.exist?(plugins_dir)
+    FileUtils.ln_sf('/opt/opscode/chef-server-plugin.rb', drbd_plugin) unless
+      File.exist?(drbd_plugin)
+  end
+
+  def check_ha_volume
+    log 'Checking that the HA storage volume is mounted'
+    ha_data_dir = manifest['ha']['path']
+
+    unless ha_data_dir_mounted?(ha_data_dir)
+      fail "Please mount the data directory #{ha_data_dir} and perform any DRBD configuration before continuing"
+    end
+  end
+
+  def ha_data_dir_mounted?(ha_data_dir)
+    File.read('/proc/mounts').split("\n").grep(/#{ha_data_dir}/).count > 0
+  end
+
+  def touch_drbd_ready
+    log 'Touching drbd_ready file'
+    FileUtils.touch('/var/opt/opscode/drbd/drbd_ready') unless
+      File.exist?('/var/opt/opscode/drbd/drbd_ready')
+  end
+
   def reconfigure_server
     log 'Reconfiguring the Chef Server'
     shell_out('chef-server-ctl reconfigure')

data/lib/chef_backup/version.rb

@@ -1,4 +1,4 @@
 # ChefBackup module
 module ChefBackup
-  VERSION = '0.0.1.dev.3'
+  VERSION = '0.0.1.dev.4'
 end

data/spec/fixtures/chef-server-running.json

@@ -534,6 +534,10 @@
     },
     "lb-internal": {
     },
+    "ha": {
+      "provider": "drbd",
+      "path": "/var/opt/opscode/drbd/data"
+    },
     "topology": "ha",
     "servers": {
       "backend1.opscode.kryptonite": {

data/spec/unit/strategy/backup/tar_spec.rb

@@ -60,7 +60,7 @@ describe ChefBackup::Strategy::TarBackup do
       end
     end
 
-    context 'on a standlone' do
+    context 'on a standalone' do
       before { private_chef('role' => 'standalone') }
 
       context 'during an online backup' do
@@ -224,7 +224,7 @@ describe ChefBackup::Strategy::TarBackup do
       allow(subject).to receive(:data_map).and_return(data_map)
       allow(subject).to receive(:stateful_services).and_return(services)
       allow(subject).to receive(:config_directories).and_return(configs)
-      %w(add_service add_config).each do |method|
+      %w(add_service add_config add_ha_info).each do |method|
         allow(data_map).to receive(method.to_sym).and_return(true)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef_backup
 version: !ruby/object:Gem::Version
-  version: 0.0.1.dev.3
+  version: 0.0.1.dev.4
 platform: ruby
 authors:
 - Ryan Cragun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: di-ruby-lvm
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.32.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.28'
+        version: 0.32.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -251,3 +251,4 @@ test_files:
 - spec/unit/strategy/restore/shared_examples/restore.rb
 - spec/unit/strategy/restore/tar_spec.rb
 - spec/unit/strategy_spec.rb
+has_rdoc: