Changing provider from virtualbox to lxc

Paulo Tada
1 parent 0f55b412
Showing 2 changed files with 19 additions and 14 deletions Show diff stats
Rakefile
Vagrantfile
@@ -22,7 +22,7 @@ chake_rsync_options += &#39; --exclude src&#39;
 ENV['CHAKE_RSYNC_OPTIONS'] = chake_rsync_options
 if $SPB_ENV == 'lxc'
-  system("mkdir -p config/lxc; sudo lxc-ls -f -F name,ipv4 | sed -e '/^softwarepublico/ !d; s/softwarepublico_//; s/_[0-9_]*/:/ ' > #{ips_file}.new")
+  system("mkdir -p config/lxc; sudo lxc-ls -f -F name,ipv4 | sed -e '/^[deirs]/ !d ; s/\s/:/' > #{ips_file}.new")
   begin
     ips = YAML.load_file("#{ips_file}.new")
     raise ArgumentError unless ips.is_a?(Hash)
@@ -9,7 +9,10 @@ load &#39;./local.rake&#39; if File.exists?(&#39;local.rake&#39;)
 VAGRANTFILE_API_VERSION = "2"
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = ENV.fetch("VAGRANT_BOX", 'seocam/centos-7.0')
+
+  # Place the main box
+  config.vm.box = ENV.fetch("VAGRANT_BOX", 'frensjan/centos-7-64-lxc')
+
   proxy = ENV['http_proxy'] || ENV['HTTP_PROXY']
   if proxy
     config.vm.provision 'shell', path: 'utils/proxy.sh', args: [proxy]
@@ -24,30 +27,32 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
   config.vm.define 'database' do |database|
-    database.vm.provider "virtualbox" do |vm, override|
-      override.vm.network 'private_network', ip: ips['database'] if ips
+    database.vm.provider :lxc do |vm|
+      vm.container_name = :machine
     end
   end
+
   config.vm.define 'integration' do |integration|
-    integration.vm.provider "virtualbox" do |vm, override|
-      override.vm.network 'private_network', ip: ips['integration'] if ips
-      vm.memory = 1024
-      vm.cpus = 2
+    integration.vm.provider :lxc do |vm|
+      vm.container_name = :machine
     end
   end
+
   config.vm.define 'email' do |email|
-    email.vm.provider "virtualbox" do |vm, override|
-      override.vm.network 'private_network', ip: ips['email'] if ips
+    email.vm.provider :lxc do |vm|
+      vm.container_name = :machine
     end
   end
+
   config.vm.define 'social' do |social|
-    social.vm.provider "virtualbox" do |vm, override|
-      override.vm.network 'private_network', ip: ips['social'] if ips
+    social.vm.provider :lxc do |vm|
+      vm.container_name = :machine
     end
   end
+
   config.vm.define 'reverseproxy' do |reverseproxy|
-    reverseproxy.vm.provider "virtualbox" do |vm, override|
-      override.vm.network 'private_network', ip: ips['reverseproxy'] if ips
+    reverseproxy.vm.provider :lxc do |vm|
+      vm.container_name = :machine
     end
     if File.exist?("tmp/preconfig.#{env}.stamp")
       reverseproxy.ssh.port =  File.read("tmp/preconfig.#{env}.stamp").strip.to_i
	@@ -22,7 +22,7 @@ chake_rsync_options += ' --exclude src'		@@ -22,7 +22,7 @@ chake_rsync_options += ' --exclude src'
22	ENV['CHAKE_RSYNC_OPTIONS'] = chake_rsync_options	22	ENV['CHAKE_RSYNC_OPTIONS'] = chake_rsync_options
23		23
24	if $SPB_ENV == 'lxc'	24	if $SPB_ENV == 'lxc'
25	- system("mkdir -p config/lxc; sudo lxc-ls -f -F name,ipv4 \| sed -e '/^softwarepublico/ !d; s/softwarepublico_//; s/_[0-9_]*/:/ ' > #{ips_file}.new")	25	+ system("mkdir -p config/lxc; sudo lxc-ls -f -F name,ipv4 \| sed -e '/^[deirs]/ !d ; s/\s/:/' > #{ips_file}.new")
26	begin	26	begin
27	ips = YAML.load_file("#{ips_file}.new")	27	ips = YAML.load_file("#{ips_file}.new")
28	raise ArgumentError unless ips.is_a?(Hash)	28	raise ArgumentError unless ips.is_a?(Hash)