Merge branch 'release/2.0.2'

CloudBindle · Jun 5, 2015 · 9d3ec41 · 9d3ec41
2 parents 27d9be1 + e5d44a0
commit 9d3ec41
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/bin/generate_master_inventory_file_for_ansible.pl b/bin/generate_master_inventory_file_for_ansible.pl
@@ -9,7 +9,7 @@
 use FindBin qw($Bin);
 
 ### usage
-# perl bin/launcher/generate_master_inventory.pl <ansible-ssh-host> > inventory
+# perl bin/launcher/generate_master_inventory_file_for_ansible.pl <ansible-ssh-host> > inventory
 
 my $ansible_ssh_host = $ARGV[0];
 

diff --git a/install/roles/bindle-dependencies/tasks/main.yml b/install/roles/bindle-dependencies/tasks/main.yml
@@ -51,11 +51,11 @@
   retries: 5
   delay: 10
 
-- name: Install Vagrant providers - VCloud
-  sudo: "{{ user_name }}"
-  command: vagrant plugin install vagrant-vcloud --plugin-version 0.4.3 
-  retries: 5
-  delay: 10
+#- name: Install Vagrant providers - VCloud
+#  sudo: "{{ user_name }}"
+#  command: vagrant plugin install vagrant-vcloud --plugin-version 0.4.3 
+#  retries: 5
+#  delay: 10
 
 
 - name: Install Perl dependencies

diff --git a/install/roles/bindle-dependencies/templates/openstack.cfg b/install/roles/bindle-dependencies/templates/openstack.cfg
@@ -28,7 +28,11 @@ install_workflow=True
 workflow_name=BWA,HelloWorld
 workflows=Workflow_Bundle_BWA_2.6.1_SeqWare_1.1.0-alpha.5,Workflow_Bundle_HelloWorld_1.0-SNAPSHOT_SeqWare_1.1.1
 
-lvm_device_whitelist="/dev/<device>"
+# Change this if you want to use an ephemeral disk
+#lvm_device_whitelist="/dev/<device>"
+
+# Set "single_node_lvm" as false if your VM has a large enough root disk and you don't need to use an ephemeral disk
+# single_node_lvm=false
 
 bwa_workflow_version = 2.6.1