Add parameter to rst_to_html to pass machine-specific welcome documentation.

mvousden · mvousden · commit c569a5877903 · 2016-03-02T17:49:53.000Z
diff --git a/jobs/provision_virtualmicromagnetics_fidimag.yml b/jobs/provision_virtualmicromagnetics_fidimag.yml
@@ -11,6 +11,6 @@
   roles:
     - fidimag
     - xserver
-    - rst_to_html
+    - { role: rst_to_html, SOURCE_PATH: /vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst }
     - add_super_user
     - { role: set_hostname, HOSTNAME: {{ vm_name }} }
diff --git a/jobs/provision_virtualmicromagnetics_full.yml b/jobs/provision_virtualmicromagnetics_full.yml
@@ -19,6 +19,6 @@
     - nmag_examples
     - fidimag
     - xserver
-    - rst_to_html
+    - { role: rst_to_html, SOURCE_PATH: /vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst }
     - add_super_user
     - { role: set_hostname, HOSTNAME: {{ vm_name }} }
diff --git a/jobs/provision_virtualmicromagnetics_lite.yml b/jobs/provision_virtualmicromagnetics_lite.yml
@@ -17,6 +17,6 @@
     - nmag_examples
     - fidimag
     - xserver
-    - rst_to_html
+    - { role: rst_to_html, SOURCE_PATH: /vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst }
     - add_super_user
     - { role: set_hostname, HOSTNAME: {{ vm_name }} }
diff --git a/jobs/provision_virtualmicromagnetics_magpar.yml b/jobs/provision_virtualmicromagnetics_magpar.yml
@@ -12,6 +12,6 @@
     - magpar
     - magpar_examples
     - xserver
-    - rst_to_html
+    - { role: rst_to_html, SOURCE_PATH: /vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst }
     - add_super_user
     - { role: set_hostname, HOSTNAME: {{ vm_name }} }
diff --git a/jobs/provision_virtualmicromagnetics_nmag.yml b/jobs/provision_virtualmicromagnetics_nmag.yml
@@ -12,6 +12,6 @@
     - nmag
     - nmag_examples
     - xserver
-    - rst_to_html
+    - { role: rst_to_html, SOURCE_PATH: /vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst }
     - add_super_user
     - { role: set_hostname, HOSTNAME: {{ vm_name }} }
diff --git a/jobs/provision_virtualmicromagnetics_oommf.yml b/jobs/provision_virtualmicromagnetics_oommf.yml
@@ -12,6 +12,6 @@
     - oommf
     - oommf_examples
     - xserver
-    - rst_to_html
+    - { role: rst_to_html, SOURCE_PATH: /vagrant/extra_resources/welcome/welcome_{{ vm_name }}.rst }
     - add_super_user
     - { role: set_hostname, HOSTNAME: {{ vm_name }} }
diff --git a/roles/rst_to_html/vars/main.yml b/roles/rst_to_html/vars/main.yml
@@ -1,6 +1,9 @@
 # By default, these vars will build the welcoming documentation for the user's
 # desktop. They should be overwritten when specific files are to be built.
 
+# User must define SOURCE_PATH, which is the path to the RST file on the
+# virtual machine.
+
 BUILD_DIR: /etc/skel/Desktop
-SOURCE_PATH: /vagrant/extra_resources/welcome.rst
-BUILD_NAME: Welcome.html
+BUILD_NAME: Welcome.html
+
