From 91fe9c17ea5ebd37ebdf7913c86e4fd717700e8e Mon Sep 17 00:00:00 2001 From: Fabio Rapposelli Date: Thu, 2 Jul 2015 18:55:40 +0200 Subject: [PATCH] Add shortcut options `memory` and `cpus` to provider configuration. --- README.md | 4 ++-- lib/vagrant-vmware-appcatalyst/action/import.rb | 12 ++++++++++++ lib/vagrant-vmware-appcatalyst/config.rb | 10 ++++++++++ lib/vagrant-vmware-appcatalyst/version.rb | 2 +- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fcb8316..95e47ba 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Vagrant.configure('2') do |config| # Configure our boxes with 1 CPU and 384MB of RAM config.vm.provider 'vmware_appcatalyst' do |v| - v.vmx['numvcpus'] = '1' - v.vmx['memsize'] = '384' + v.cpus = '1' + v.memory = '384' end # Go through nodes and configure each of them.j diff --git a/lib/vagrant-vmware-appcatalyst/action/import.rb b/lib/vagrant-vmware-appcatalyst/action/import.rb index cd7cc6f..296deb3 100644 --- a/lib/vagrant-vmware-appcatalyst/action/import.rb +++ b/lib/vagrant-vmware-appcatalyst/action/import.rb @@ -40,6 +40,18 @@ def call(env) "#{env[:machine].data_dir}/#{uuid}/*.vmx" ).first + env[:appcatalyst_cnx].set_vmx_value( + vmx_file, + 'memsize', + env[:machine].provider_config.memory + ) unless env[:machine].provider_config.memory.empty? + + env[:appcatalyst_cnx].set_vmx_value( + vmx_file, + 'numvcpus', + env[:machine].provider_config.cpus + ) unless env[:machine].provider_config.cpus.empty? + # Make sure we use Virtual HW 11 env[:appcatalyst_cnx].set_vmx_value(vmx_file, 'virtualHW.version', '11') diff --git a/lib/vagrant-vmware-appcatalyst/config.rb b/lib/vagrant-vmware-appcatalyst/config.rb index 23f8543..f9b1af9 100644 --- a/lib/vagrant-vmware-appcatalyst/config.rb +++ b/lib/vagrant-vmware-appcatalyst/config.rb @@ -23,6 +23,16 @@ class Config < Vagrant.plugin('2', :config) # @return [Hash] attr_accessor :vmx + # Shortcut to set memory in the VM + # + # @return [String] + attr_accessor :memory + + # Shortcut to set cpus in the VM + # + # @return [String] + attr_accessor :cpus + # REST API daemon port, default 8080 # # @return [String] diff --git a/lib/vagrant-vmware-appcatalyst/version.rb b/lib/vagrant-vmware-appcatalyst/version.rb index d3c8405..897a69f 100644 --- a/lib/vagrant-vmware-appcatalyst/version.rb +++ b/lib/vagrant-vmware-appcatalyst/version.rb @@ -13,6 +13,6 @@ module VagrantPlugins module AppCatalyst - VERSION = '1.0.1' + VERSION = '1.0.2' end end