vagrant-lfstacks 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4079054be88e06ce0a5cbd1b0fec91738e1991d0
-  data.tar.gz: 2c16a3afe031b4fb44c0396579ba383b8d439be0
+  metadata.gz: f95597ff7c38a0522acbbf46b291ebb17e9053e6
+  data.tar.gz: 4ccb4319c32f4e0e3f7e3ee4fd2ed7b5f51cc46b
 SHA512:
-  metadata.gz: b5eb4b5875f71fe041da44fce6901f785a8e12bf0d1f45563af40fc3d12ed2014b64889e2cbbd45f5484b902b28b1191beefd21d3ed627bdb5314e59d846c768
-  data.tar.gz: 7e18592636adb4e12c7ba761d5d7b0482b72f540e1d4e94f900f0fe0845e6d9c50f451d2819ec4cb125e07b9fac04809ab69623510f404c6c5e4f5c4da4f1d60
+  metadata.gz: 510c98fe2af6fdb2f0d8c59aa837283c22c44178340018c128d05147dbb0ab4a4cf24203d58125cc5f8b5d58f86554e2a10b7cc04c44fc133b6e741bfda0bccc
+  data.tar.gz: 9a9fc870d7c0c89f48de5e52323d0be9c018f5b401dba07dc14cce3d07c144db67c3cfb8dbcbba6b6888a9f09b15f02730429d880136b709fd743be5acc9f3f3

data/Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'aws-s3', :require => 'aws/s3'
 gem 'vagrant-dns'
+gem 'vagrant-cachier'
 
 
 # Specify your gem's dependencies in lfstacks.gemspec

data/Vagrantfile.dev_example

@@ -11,10 +11,13 @@ require 'vagrant-lfstacks'
 
 require 'yaml'
 require 'pp'
+require 'erb'
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+# NK Global config hash.  When creating a new key for overrides, YOU MUST PROVIDE A DEFAULT HERE!
+
 global_config = {
   :tld => 'localdev.livefyre.com',
   :synced_folders => [
@@ -23,17 +26,22 @@ global_config = {
     ["#{ENV['HOME']}/dev/lfconfig", '/opt/lfconfig'],
   ],
   :cache => true,
-  :vb_mem => '1024',
-  :vb_cpus => '8',
+  :vb_mem => '512',
+  :vb_cpus => '1',
   :vbg_auto_update => true,
   :vb_gui => false,
+  :userdata_template_path => "#{ENV['HOME']}/dev/lfconfig/ops_tools/lfstacks/lfuserdata.sh.erb",
+  :userdata_provision => true
 }
 
+
+
+
 # NK here we grab any overrides
 
-if File.exists?('./config.d/global_overrides.yaml')
-  overrides = YAML.load_file('./config.d/global_overrides.yaml')
-  global_config.update(overrides)
+if File.exists?('./config.d/global_overrides.yml')
+  overrides = YAML.load_file('./config.d/global_overrides.yml')
+  global_config.update(overrides) if overrides
 end
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@@ -48,6 +56,18 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
         puppet_config.vm.network "private_network", ip: guest[:ip]
         #puppet_config.vm.customize ["setextradata", :id, cnames]
         puppet_config.vm.host_name = "#{guest[:hostname]}.#{guest[:domain]}"
+
+        # USERDATA provisioning!
+        if global_config[:userdata_provision]
+          # NK **** This follows our nodes.pp convention, see Andrew on why he wants to follow it.
+          role = /^(\D+)(\d*)$/.match(guest[:hostname])[0]
+          @hostname = "#{guest[:hostname]}.#{guest[:domain]}"
+          template = File.read(global_config[:userdata_template_path])
+          @userdata_vagrant = true
+          user_data = ERB.new(template).result(binding)
+          puppet_config.vm.provision 'shell', inline: user_data
+        end
+        
       end
     end
   end
@@ -59,8 +79,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.synced_folder(*synced_folder)
   end
   
-  # config.cache.auto_detect = true if global_config[:cache]
-  # config.vbguest.auto_update = false unless global_config[:vbg_auto_update]
+
+
+
+  # short term fix for vagrant dns issue....see https://github.com/BerlinVagrant/vagrant-dns/issues/27
+  # Will be fixed in Vagrant 1.5.0, see https://github.com/mitchellh/vagrant/issues/2756
+  VagrantDNS::Config.auto_run = false
   
 
 

data/lib/commands/reimage.rb

@@ -21,13 +21,13 @@ class ReimageCommand < Vagrant.plugin(2, :command)
     end
 
     with_target_vms("puppet") do |machine|
-        @env.ui.info "Removing #{machine.name}'s cert on puppet master" 
+        @env.ui.info "Removing #{machine.name}'s cert on puppet master", :color => :green 
         argv.each do |target|
-            ssh_cmd machine, "puppet cert clean #{target}.localdev.livefyre.com || true"
+            ssh_cmd(machine, "puppet cert clean #{target}.localdev.livefyre.com", {:error_check => false})
         end
     end
     with_target_vms(argv) do |machine|
-        @env.ui.info "Destroying #{machine.name}" 
+        @env.ui.info "Destroying #{machine.name}", :color => :green 
         machine.action(:destroy, :force_confirm_destroy => true)
         machine.action(:up)
         
@@ -35,13 +35,13 @@ class ReimageCommand < Vagrant.plugin(2, :command)
         # initialization.
         # this is the issue on REHL:
         # https://github.com/mitchellh/vagrant/pull/1577
-        cycle_iface machine, "eth1"
-        ssh_cmd machine, "rm -rf /var/lib/puppet/"
-        ssh_cmd machine, "/puppet_configs/scripts/ensure_hostname #{machine.name}.localdev.livefyre.com"
-        @env.ui.info "Installing puppet for #{machine.name}" 
-        ssh_cmd machine, "/puppet_configs/scripts/ensure_puppet_installed client"
-        @env.ui.info "Running puppet on#{machine.name}" 
-        ssh_cmd machine, "/puppet_configs/scripts/ensure_puppet_converged -w"
+        # cycle_iface machine, "eth1"
+        # ssh_cmd machine, "rm -rf /var/lib/puppet/"
+        # ssh_cmd machine, "/puppet_configs/scripts/ensure_hostname #{machine.name}.localdev.livefyre.com"
+        # @env.ui.info "Installing puppet for #{machine.name}" 
+        # ssh_cmd machine, "/puppet_configs/scripts/ensure_puppet_installed client"
+        # @env.ui.info "Running puppet on#{machine.name}" 
+        # ssh_cmd machine, "/puppet_configs/scripts/ensure_puppet_converged -w"
     end
 end
 end

data/lib/commands/remaster.rb

@@ -9,7 +9,7 @@ class RemasterCommand < Vagrant.plugin(2, :command)
   end
 
   def self.synopsis
-    "Sets up a new puppet master while recycling the SSL keys on a puppetdb"
+    "DOES NOT WORK YET -- Sets up a new puppet master while recycling the SSL keys on a puppetdb"
   end
 
   def execute

data/lib/commands/repuppet.rb

@@ -19,7 +19,7 @@ class RepuppetCommand < Vagrant.plugin(2, :command)
     # Destroy all the puppet infrastructure #
     #########################################
     with_target_vms('puppetdb') do |machine|
-        @env.ui.info "Destroying puppet db"
+        @env.ui.info "Destroying puppet db", :color => :green
         machine.action(:destroy, :force_confirm_destroy=>true)
     end
     with_target_vms('puppet') do |machine|
@@ -31,7 +31,7 @@ class RepuppetCommand < Vagrant.plugin(2, :command)
     # Rebuild the puppet master in no-db mode #
     ###########################################
     with_target_vms('puppet') do |machine|
-        @env.ui.info "rebuilding puppet"
+        @env.ui.info "rebuilding puppet", :color => :green
         machine.action(:up)
 
         # this is hack to get around a bug in the vagrant
@@ -40,15 +40,15 @@ class RepuppetCommand < Vagrant.plugin(2, :command)
         # https://github.com/mitchellh/vagrant/pull/1577
         cycle_iface machine, "eth1"
 
-        @env.ui.info "Bootstrapping puppet master"
-        ssh_cmd machine, "/puppet_configs/scripts/puppet_master_setup.sh puppet.localdev.livefyre.com"
+        @env.ui.info "Bootstrapping puppet master", :color => :green
+        # ssh_cmd machine, "/opt/lfuserdata/puppet_master_setup.sh puppet.localdev.livefyre.com"
     end
 
     ########################
     # Rebuild the puppetdb #
     ########################
     with_target_vms('puppetdb') do |machine|
-        @env.ui.info "rebuilding puppetdb"
+        @env.ui.info "rebuilding puppetdb", :color => :green
         machine.action(:up)
 
         # this is hack to get around a bug in the vagrant
@@ -57,18 +57,18 @@ class RepuppetCommand < Vagrant.plugin(2, :command)
         # https://github.com/mitchellh/vagrant/pull/1577
         cycle_iface machine, "eth1"
 
-        @env.ui.info "Bootstrapping puppetdb"
-        ssh_cmd machine, "/puppet_configs/scripts/puppet_db_setup.sh puppetdb.localdev.livefyre.com"
-        @env.ui.info "Running puppet on puppet db"
-        ssh_cmd machine, "/puppet_configs/scripts/ensure_puppet_converged -w"
+        # @env.ui.info "Bootstrapping puppetdb"
+        # ssh_cmd machine, "/opt/lfuserdata/puppet_db_setup.sh puppetdb.localdev.livefyre.com"
+        # @env.ui.info "Running puppet on puppet db"
+        # ssh_cmd machine, "/opt/lfuserdata/ensure_puppet_converged.sh -w"
     end
 
     #####################################
     # Re-enable store configs in puppet #
     #####################################
     with_target_vms('puppet') do |machine|
-        @env.ui.info "Running puppet on puppet master"
-        ssh_cmd machine, "/puppet_configs/scripts/ensure_puppet_converged -w"
+        @env.ui.info "Running puppet on puppet master", :color => :green
+        ssh_cmd machine, "/opt/lfuserdata/ensure_puppet_converged.sh -w"
     end
   end
 end

data/lib/commands/rssh.rb

@@ -0,0 +1,28 @@
+
+require "vagrant/util/ssh"
+
+class RsshCommand < Vagrant.plugin(2, :command)
+
+  def self.synopsis
+    "Ssh on the secondary interface to work around network freeze"
+  end
+
+  def execute
+
+    argv = parse_options
+    return unless argv.length == 1
+
+    target_machine = argv[0]
+    with_target_vms(argv) do |machine|
+      
+      old_info = machine.ssh_info.dup
+      old_info[:port] = 22
+      old_info[:host] =  machine.config.vm.hostname
+      # key_path = info[:private_key_path]
+      # `ssh -i #{key_path} vagrant@#{machine.host_name}`
+      Vagrant::Util::SSH.exec(old_info)
+    end
+
+  end 
+
+end

data/lib/vagrant-lfstacks/version.rb

@@ -1,4 +1,4 @@
   module Lfstacks
-    VERSION = "0.0.1"
+    VERSION = "0.1.1"
   end
 

data/lib/vagrant-lfstacks.rb

@@ -46,6 +46,11 @@ module Lfstacks
       BootstrapCommand
     end
 
+    command "rssh" do
+      require_relative 'commands/rssh'
+      RsshCommand
+    end
+
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lfstacks
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Navid Khalili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - lib/commands/reimage.rb
 - lib/commands/remaster.rb
 - lib/commands/repuppet.rb
+- lib/commands/rssh.rb
 - lib/commands/s3box.rb
 - lib/vagrant-lfstacks.rb
 - lib/vagrant-lfstacks/utils.rb