vagabond 0.2.6 → 0.2.8

data/lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/recipes/lwrps.rb

@@ -0,0 +1,66 @@
+#
+# Cookbook Name:: apt_test
+# Recipe:: lwrps
+#
+# Copyright 2012, Opscode, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+include_recipe "apt"
+
+# Apt Repository
+apt_repository "opscode" do
+  uri "http://apt.opscode.com"
+  components ["main"]
+  distribution "#{node['lsb']['codename']}-0.10"
+  key "2940ABA983EF826A"
+  keyserver "pgpkeys.mit.edu"
+  action :add
+end
+
+# Apt Repository with arch
+apt_repository "cloudera" do
+  uri "http://archive.cloudera.com/cdh4/ubuntu/precise/amd64/cdh"
+  arch "amd64"
+  distribution "precise-cdh4"
+  components ["contrib"]
+  key "http://archive.cloudera.com/debian/archive.key"
+  action :add
+end
+
+# Apt repository and install a package it contains
+apt_repository "nginx" do
+  uri "http://nginx.org/packages/ubuntu"
+  distribution node['lsb']['codename']
+  components ["nginx"]
+  key "http://nginx.org/keys/nginx_signing.key"
+  deb_src true
+end
+
+package "nginx-debug" do
+  action :upgrade
+end
+
+# Apt Preferences
+apt_preference "chef" do
+  pin "version 10.16.2-1"
+  pin_priority "700"
+end
+
+# COOK-2338
+apt_preference "dotdeb" do
+  glob "*"
+  pin "origin packages.dotdeb.org "
+  pin_priority "700"
+end

data/lib/vagabond/cookbooks/vagabond/metadata.rb

@@ -5,3 +5,4 @@ maintainer 'Chris Roberts'
 maintainer_email 'chrisroberts.code@gmail.com'
 
 depends 'lxc'
+depends 'apt'

data/lib/vagabond/cookbooks/vagabond/recipes/default.rb

@@ -33,6 +33,7 @@ unless(node[:network][:interfaces][:lxcbr0])
 end
 =end
 
+include_recipe 'apt::cacher-ng'
 include_recipe 'lxc'
 
 ruby_block 'LXC template: lxc-centos' do
@@ -66,6 +67,8 @@ node[:vagabond][:bases].each do |name, options|
   ]
   if(!options[:template].scan(%r{debian|ubuntu}).empty?)
     pkg_man = 'apt-get'
+    proxy = ["echo \"Acquire::http::Proxy \\\"http://#{node[:lxc][:addr]}:#{node[:apt][:cacher_port]}\\\";\" > /etc/apt/apt.conf.d/01proxy"]
+    proxy << "echo \"Acquire::https::Proxy \\\"DIRECT\\\";\" >> /etc/apt/apt.conf.d/01proxy"
   elsif(!options[:template].scan(%r{fedora|centos}).empty?)
     pkg_man = 'yum'
   end
@@ -76,6 +79,7 @@ node[:vagabond][:bases].each do |name, options|
   else
     pkg_coms = []
   end
+  pkg_coms = proxy + pkg_coms if proxy
 
   lxc_container name do
     template options[:template]
@@ -83,6 +87,8 @@ node[:vagabond][:bases].each do |name, options|
     default_config false if options[:memory]
     create_environment options[:environment] if options[:environment]
     initialize_commands [
+      'locale-gen en_US.UTF-8',
+      'update-locale LANG="en_US.UTF-8"',
       'rm -f /etc/sysctl.d/10-console-messages.conf',
       'rm -f /etc/sysctl.d/10-ptrace.conf',
       'rm -f /etc/sysctl.d/10-kernel-hardening.conf'
@@ -92,6 +98,8 @@ node[:vagabond][:bases].each do |name, options|
   end
 end
 
+=begin
+# TODO: This will be the base for building ephemeral servers
 lxc_container 'chef-server' do
   clone 'ubuntu_1204'
   initialize_commands [
@@ -101,6 +109,7 @@ lxc_container 'chef-server' do
     node[:vagabond][:server_base]
   end
 end
+=end
 
 node[:vagabond][:customs].each do |name, options|
 

data/lib/vagabond/vagabond.rb

@@ -159,10 +159,14 @@ module Vagabond
     def load_configurations
       @vagabondfile = Vagabondfile.new(options[:vagabond_file], :allow_missing)
       options[:sudo] = sudo
-      options[:disable_solo] = true if @action.to_s == 'status' && lxc_installed?
+      # TODO: provide action call back for full or partial solo disable
+      if((@action.to_s == 'status' && lxc_installed?) || @action.to_s == 'init')
+        options[:disable_solo] = true
+      end
       Chef::Log.init('/dev/null') unless options[:debug]
       Lxc.use_sudo = @vagabondfile[:sudo].nil? ? true : @vagabondfile[:sudo]
       @internal_config = InternalConfiguration.new(@vagabondfile, ui, options)
+      options[:disable_solo] = false if @action.to_s == 'init'
       @config = @vagabondfile[:boxes][name]
       @lxc = Lxc.new(@internal_config[mappings_key][name] || '____nonreal____')
       if(options[:local_server] && lxc_installed?)

data/lib/vagabond/version.rb

@@ -6,5 +6,5 @@ module Vagabond
       super(v)
     end
   end
-  VERSION = Version.new('0.2.6', 'gutterpup')
+  VERSION = Version.new('0.2.8', 'nomad')
 end

data/test/Vagrantfile

@@ -0,0 +1,48 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure("2") do |config|
+  config.vm.hostname = "sensu-lxc-host"
+  config.vm.box = 'precise-64-lxc-preseed'
+  config.vm.box_url = 'http://vagrant.hw-ops.com/precise-64-lxc-preseed.box'
+
+  if(ENV['ENABLE_APT_PROXY'])
+    proxy = [
+      "echo \"Acquire::http::Proxy \\\"http://#{ENV['ENABLE_APT_PROXY']}:3142\\\";\" > /etc/apt/apt.conf.d/01proxy",
+      "echo \"Acquire::https::Proxy \\\"DIRECT\\\";\" >> /etc/apt/apt.conf.d/01proxy"
+    ]
+  else
+    proxy = []
+  end
+
+
+  config.vm.provision :shell do |shell|
+    shell.inline = (
+      proxy + [
+        "lxc-destroy -n ubuntu_1204",
+        "apt-get update",
+        "apt-get install -y -q ruby1.9.1-full git",
+        "gem install --no-ri --no-rdoc bundler",
+        "git clone git://github.com/chrisroberts/vagabond-test-cookbook.git",
+        "cd vagabond-test-repo",
+        "bundle install --binstubs",
+        "bin/vagabond kitchen test --debug",
+        "bin/vagabond kitchen test --cluster cacher --debug",
+        "cd ..",
+        "git clone git://github.com/chrisroberts/vagabond-test-repo.git",
+        "cd vagabond-test-repo",
+        "bundle install --binstubs",
+        "bin/vagabond up test_node --debug",
+        "bin/vagabond cluster test_cluster --debug",
+        "bin/vagabond cluster test_cluster --parallel --debug",
+        "bin/vagabond destroy test_cluster --cluster --debug",
+        "bin/vagabond server destroy --debug"
+      ]
+    ).join("\n")
+  end
+
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--cpus", "2"]
+    vb.customize ["modifyvm", :id, "--memory", "2048"]
+  end
+end

data/vagabond.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'test-kitchen', '>= 1.0.0.alpha'
   s.add_dependency 'thor'
   s.add_dependency 'uuidtools'
-  s.add_dependency 'elecksee', '>= 1.0.3'
+  s.add_dependency 'elecksee', '>= 1.0.6'
   s.add_dependency 'serverspec', '>= 0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagabond
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.6
 - !ruby/object:Gem::Dependency
   name: serverspec
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,35 @@ files:
 - lib/vagabond/cookbooks/vagabond/libraries/vagabond.rb
 - lib/vagabond/cookbooks/vagabond/recipes/default.rb
 - lib/vagabond/cookbooks/vagabond/recipes/zero.rb
+- lib/vagabond/cookbooks/apt/files/default/apt-proxy-v2.conf
+- lib/vagabond/cookbooks/apt/metadata.rb
+- lib/vagabond/cookbooks/apt/templates/default/01proxy.erb
+- lib/vagabond/cookbooks/apt/templates/default/acng.conf.erb
+- lib/vagabond/cookbooks/apt/templates/debian-6.0/acng.conf.erb
+- lib/vagabond/cookbooks/apt/templates/ubuntu-10.04/acng.conf.erb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/cacher-ng_test.rb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/lwrps_test.rb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/default_test.rb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/support/helpers.rb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/metadata.rb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/README.md
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/recipes/default.rb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/recipes/cacher-ng.rb
+- lib/vagabond/cookbooks/apt/test/cookbooks/apt_test/recipes/lwrps.rb
+- lib/vagabond/cookbooks/apt/Berksfile
+- lib/vagabond/cookbooks/apt/attributes/default.rb
+- lib/vagabond/cookbooks/apt/README.md
+- lib/vagabond/cookbooks/apt/LICENSE
+- lib/vagabond/cookbooks/apt/CONTRIBUTING
+- lib/vagabond/cookbooks/apt/providers/repository.rb
+- lib/vagabond/cookbooks/apt/providers/preference.rb
+- lib/vagabond/cookbooks/apt/TESTING.md
+- lib/vagabond/cookbooks/apt/resources/repository.rb
+- lib/vagabond/cookbooks/apt/resources/preference.rb
+- lib/vagabond/cookbooks/apt/CHANGELOG.md
+- lib/vagabond/cookbooks/apt/recipes/default.rb
+- lib/vagabond/cookbooks/apt/recipes/cacher-ng.rb
+- lib/vagabond/cookbooks/apt/recipes/cacher-client.rb
 - lib/vagabond/errors.rb
 - lib/vagabond/server.rb
 - lib/vagabond/kitchen.rb
@@ -206,9 +235,12 @@ files:
 - lib/vagabond/actions/ssh.rb
 - lib/vagabond/uploader.rb
 - lib/vagabond.rb
+- test/Vagrantfile
+- vagabond-0.2.6.gem
 - README.md
 - LICENSE
 - vagabond.gemspec
+- Vagrantfile
 - bin/vagabond
 - USAGE.md
 - CHANGELOG.md