Changes from Friday working session

CloudBindle · Nov 24, 2014 · 7b081bb · 7b081bb
1 parent 22530c1
commit 7b081bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/install/roles/bindle-dependencies/tasks/main.yml b/install/roles/bindle-dependencies/tasks/main.yml
@@ -40,11 +40,18 @@
   sudo: True
   shell: dpkg -i /tmp/vagrant_1.6.3_x86_64.deb
 
-- name: Install Vagrant providers
-  command: vagrant plugin install "{{ vagrant_plugin }}" --plugin-version {{ vagrant_plugin_version }}
+- name: Install Vagrant providers - AWS
+  sudo: "{{ user_name }}"
+  command: vagrant plugin install vagrant-aws --plugin-version 0.5.0 
+
+- name: Install Vagrant providers - OpenStack 
+  sudo: "{{ user_name }}"
+  command: vagrant plugin install vagrant-openstack-plugin --plugin-version 0.7.0
+
+- name: Install Vagrant providers - VCloud
+  sudo: "{{ user_name }}"
+  command: vagrant plugin install vagrant-vcloud --plugin-version 0.4.3 
 
-# vagrant plugin install vagrant-openstack-plugin --plugin-version 0.7.0
-# vagrant plugin install vagrant-vcloud --plugin-version 0.4.3
 
 - name: Install Perl dependencies
   sudo: True

diff --git a/install/roles/bindle-dependencies/vars/main.yml b/install/roles/bindle-dependencies/vars/main.yml
@@ -1,13 +1,9 @@
 ---
-# Add one of the following: 
-# For AWS, use: vagrant_plugin: "vagrant-aws"  and vagrant_plugin_version: "0.5.0"
-# For Openstack, use: vagrant_plugin: "vagrant-openstack-plugin" and vagrant_plugin_version: "0.7.0"
-# For vCloud, use vagrant_plugin: "vagrant-vcloud" and vagrant_plugin_version: "0.4.3" 
-vagrant_plugin: "vagrant-aws" 
-vagrant_plugin_version: "0.5.0"
 
 # The git repo branches, if you're working in production then use "master"
 bindle_git_branch: "master"
 
 # Add the name of the template Bindle config you will work with (e.g. "openstack.cfg", "aws.cfg" or "vcloud.cfg")
 bindle_config: "aws.cfg"
+
+user_name: "ubuntu"