Skip to content

Commit 38bde5a

Browse files
mvousdenmvousden
committed
Merge pull request #20 from fangohr/inf-018
Inf 018
2 parents 77a0304 + 41e2b8e commit 38bde5a

27 files changed

+105
-342
lines changed

roles/magpar_examples/templates/magpar_examples.rst renamed to guest_resources/magpar/magpar_examples.rst

File renamed without changes.

roles/nmag_examples/templates/nmag_examples.rst renamed to guest_resources/nmag/nmag_examples.rst

File renamed without changes.

roles/oommf_examples/templates/oommf_examples.rst renamed to guest_resources/oommf/oommf_examples.rst

File renamed without changes.

‎jobs/provision_virtualmicromagnetics_fidimag.yml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,9 @@
66

77
- hosts: all
88

9-
# We install docutils here instead of using the role directly, so that the
10-
# welcome file can be created before the superuser is added.
11-
pre_tasks:
12-
13-
- name: Install pip.
14-
apt:
15-
pkg=python-pip
16-
state=latest
17-
update_cache=yes
18-
cache_valid_time=86400
19-
sudo: yes
20-
21-
- name: Install docutils for Python to build documentation.
22-
pip:
23-
name=docutils
24-
sudo: yes
25-
26-
- name: Define directory in which to place welcome file.
27-
set_fact:
28-
WELCOME_DIR: /etc/skel/Desktop
29-
30-
- name: Create welcome directory.
31-
file:
32-
name={{ WELCOME_DIR }}
33-
state=directory
34-
sudo: yes
35-
36-
- name: Convert documentation to HTML and place in welcome directory.
37-
shell: rst2html.py /vagrant/extra_resources/welcome.rst Welcome.html
38-
chdir={{ WELCOME_DIR }}
39-
creates={{ WELCOME_DIR }}/Welcome.html
40-
sudo: yes
41-
429
roles:
4310
- fidimag
4411
- xserver
12+
- rst_to_html
4513
- { role: add_super_user, AUTOLOGIN: true }
4614
- { role: set_hostname, HOSTNAME: virtualmicromagnetics-fidimag }

‎jobs/provision_virtualmicromagnetics_full.yml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,6 @@
66

77
- hosts: all
88

9-
# We install docutils here instead of using the role directly, so that the
10-
# welcome file can be created before the superuser is added.
11-
pre_tasks:
12-
13-
- name: Install pip.
14-
apt:
15-
pkg=python-pip
16-
state=latest
17-
update_cache=yes
18-
cache_valid_time=86400
19-
sudo: yes
20-
21-
- name: Install docutils for Python to build documentation.
22-
pip:
23-
name=docutils
24-
sudo: yes
25-
26-
- name: Define directory in which to place welcome file.
27-
set_fact:
28-
WELCOME_DIR: /etc/skel/Desktop
29-
30-
- name: Create welcome directory.
31-
file:
32-
name={{ WELCOME_DIR }}
33-
state=directory
34-
sudo: yes
35-
36-
- name: Convert documentation to HTML and place in welcome directory.
37-
shell: rst2html.py /vagrant/extra_resources/welcome.rst Welcome.html
38-
chdir={{ WELCOME_DIR }}
39-
creates={{ WELCOME_DIR }}/Welcome.html
40-
sudo: yes
41-
429
roles:
4310
- other_dependencies
4411
- oommf
@@ -49,5 +16,6 @@
4916
- nmag_examples
5017
- fidimag
5118
- xserver
19+
- rst_to_html
5220
- { role: add_super_user, AUTOLOGIN: true }
5321
- { role: set_hostname, HOSTNAME: virtualmicromagnetics-full }

‎jobs/provision_virtualmicromagnetics_lite.yml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,6 @@
55

66
- hosts: all
77

8-
# We install docutils here instead of using the role directly, so that the
9-
# welcome file can be created before the superuser is added.
10-
pre_tasks:
11-
12-
- name: Install pip.
13-
apt:
14-
pkg=python-pip
15-
state=latest
16-
update_cache=yes
17-
cache_valid_time=86400
18-
sudo: yes
19-
20-
- name: Install docutils for Python to build documentation.
21-
pip:
22-
name=docutils
23-
sudo: yes
24-
25-
- name: Define directory in which to place welcome file.
26-
set_fact:
27-
WELCOME_DIR: /etc/skel/Desktop
28-
29-
- name: Create welcome directory.
30-
file:
31-
name={{ WELCOME_DIR }}
32-
state=directory
33-
sudo: yes
34-
35-
- name: Convert documentation to HTML and place in welcome directory.
36-
shell: rst2html.py /vagrant/extra_resources/welcome.rst Welcome.html
37-
chdir={{ WELCOME_DIR }}
38-
creates={{ WELCOME_DIR }}/Welcome.html
39-
sudo: yes
40-
418
roles:
429
- oommf
4310
- oommf_examples
@@ -47,5 +14,6 @@
4714
- nmag_examples
4815
- fidimag
4916
- xserver
17+
- rst_to_html
5018
- { role: add_super_user, AUTOLOGIN: true }
5119
- { role: set_hostname, HOSTNAME: virtualmicromagnetics-lite }

‎jobs/provision_virtualmicromagnetics_magpar.yml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,10 @@
55

66
- hosts: all
77

8-
# We install docutils here instead of using the role directly, so that the
9-
# welcome file can be created before the superuser is added.
10-
pre_tasks:
11-
12-
- name: Install pip.
13-
apt:
14-
pkg=python-pip
15-
state=latest
16-
update_cache=yes
17-
cache_valid_time=86400
18-
sudo: yes
19-
20-
- name: Install docutils for Python to build documentation.
21-
pip:
22-
name=docutils
23-
sudo: yes
24-
25-
- name: Define directory in which to place welcome file.
26-
set_fact:
27-
WELCOME_DIR: /etc/skel/Desktop
28-
29-
- name: Create welcome directory.
30-
file:
31-
name={{ WELCOME_DIR }}
32-
state=directory
33-
sudo: yes
34-
35-
- name: Convert documentation to HTML and place in welcome directory.
36-
shell: rst2html.py /vagrant/extra_resources/welcome.rst Welcome.html
37-
chdir={{ WELCOME_DIR }}
38-
creates={{ WELCOME_DIR }}/Welcome.html
39-
sudo: yes
40-
418
roles:
429
- magpar
4310
- magpar_examples
4411
- xserver
12+
- rst_to_html
4513
- { role: add_super_user, AUTOLOGIN: true }
4614
- { role: set_hostname, HOSTNAME: virtualmicromagnetics-magpar }

‎jobs/provision_virtualmicromagnetics_nmag.yml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,10 @@
55

66
- hosts: all
77

8-
# We install docutils here instead of using the role directly, so that the
9-
# welcome file can be created before the superuser is added.
10-
pre_tasks:
11-
12-
- name: Install pip.
13-
apt:
14-
pkg=python-pip
15-
state=latest
16-
update_cache=yes
17-
cache_valid_time=86400
18-
sudo: yes
19-
20-
- name: Install docutils for Python to build documentation.
21-
pip:
22-
name=docutils
23-
sudo: yes
24-
25-
- name: Define directory in which to place welcome file.
26-
set_fact:
27-
WELCOME_DIR: /etc/skel/Desktop
28-
29-
- name: Create welcome directory.
30-
file:
31-
name={{ WELCOME_DIR }}
32-
state=directory
33-
sudo: yes
34-
35-
- name: Convert documentation to HTML and place in welcome directory.
36-
shell: rst2html.py /vagrant/extra_resources/welcome.rst Welcome.html
37-
chdir={{ WELCOME_DIR }}
38-
creates={{ WELCOME_DIR }}/Welcome.html
39-
sudo: yes
40-
418
roles:
429
- nmag
4310
- nmag_examples
4411
- xserver
12+
- rst_to_html
4513
- { role: add_super_user, AUTOLOGIN: true }
4614
- { role: set_hostname, HOSTNAME: virtualmicromagnetics-nmag }

‎jobs/provision_virtualmicromagnetics_oommf.yml‎

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,10 @@
55

66
- hosts: all
77

8-
# We install docutils here instead of using the role directly, so that the
9-
# welcome file can be created before the superuser is added.
10-
pre_tasks:
11-
12-
- name: Install pip.
13-
apt:
14-
pkg=python-pip
15-
state=latest
16-
update_cache=yes
17-
cache_valid_time=86400
18-
sudo: yes
19-
20-
- name: Install docutils for Python to build documentation.
21-
pip:
22-
name=docutils
23-
sudo: yes
24-
25-
- name: Define directory in which to place welcome file.
26-
set_fact:
27-
WELCOME_DIR: /etc/skel/Desktop
28-
29-
- name: Create welcome directory.
30-
file:
31-
name={{ WELCOME_DIR }}
32-
state=directory
33-
sudo: yes
34-
35-
- name: Convert documentation to HTML and place in welcome directory.
36-
shell: rst2html.py /vagrant/extra_resources/welcome.rst Welcome.html
37-
chdir={{ WELCOME_DIR }}
38-
creates={{ WELCOME_DIR }}/Welcome.html
39-
sudo: yes
40-
418
roles:
429
- oommf
4310
- oommf_examples
4411
- xserver
12+
- rst_to_html
4513
- { role: add_super_user, AUTOLOGIN: true }
4614
- { role: set_hostname, HOSTNAME: virtualmicromagnetics-oommf }

‎roles/docutils/tasks/main.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)