Skip to content

Commit

Permalink
update role versions
Browse files Browse the repository at this point in the history
 * numerous role updates for #96
 * update image + build process
  • Loading branch information
ltalirz committed Jul 23, 2019
1 parent 362a9e4 commit abc92f4
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 47 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# Changelog

## Quantum Mobile v19.04.0
## Quantum Mobile v19.07.0

### Improvements
* now installing fixed versions of ansible roles for improved reproducibility
and tracking of changes between Quantum Mobile releases

### Build process
* ansible 2.7.10
* Vagrant v2.2.5
* vbguest v0.19.0
* bento/ubuntu-18.04 v201906.18.0
* Virtualbox v6.0.10

## Quantum Mobile v19.03.0

Expand Down
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Vagrant.configure(2) do |config|
#config.vm.box = "bento/ubuntu-16.04"
#config.vm.box_version = "201803.24.0"
config.vm.box = "bento/ubuntu-18.04"
config.vm.box_version = "201812.27.0"
config.vm.box_version = "201906.18.0"
#config.vm.box = "ubuntu/xenial64"
config.vm.boot_timeout = 60

Expand Down
2 changes: 1 addition & 1 deletion globalconfig.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# Caution: This file is read by vagrant, ansible and bash
vm_version: "19.03.0"
vm_version: "19.07.0"
vm_name: "Quantum Mobile"
vm_description: "A Virtual Machine for Computational Materials Science"
vm_url: "https://github.com/marvel-nccr/marvel-virtualmachine"
Expand Down
6 changes: 4 additions & 2 deletions other_stuff/reconnect_vagrant.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
In order to connect vagrant to a new VM in Virtualbox:
In order to connect vagrant to a new VM in Virtualbox, use ./reconnect_vagrant.sh

### Old instructions

1. Get uuid of machine from: vboxmanage list vms
2. echo "<the-uuid>" > .vagrant/machines/default/virtualbox/id
Expand All @@ -10,7 +12,7 @@ folder which contains, amongst other things, the private key.

3. cp ~/.vagrant.d/insecure_private_key .vagrant/machines/default/virtualbox/
4. Generate the corresponding public key
ssh-keygen -y -f ~/.vagrant.d/insecure_private_key
ssh-keygen -y -f ~/.vagrant.d/private_key
5. Use the Virtualbox GUI to paste the public key inside the VM:
mkdir -p ~/.ssh
vim ~/.ssh/authorized_keys
Expand Down
39 changes: 10 additions & 29 deletions playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
hosts: default
gather_facts: no
roles:
- marvel-nccr.ansible_prerequisites
- role: marvel-nccr.ansible_prerequisites

- name: Add vm user
hosts: default
gather_facts: no
tags: add_user
pre_tasks:
- name: import global variables
tags: always
Expand All @@ -25,7 +26,10 @@
vars:
add_user_name: "{{ vm_user }}"
add_user_password: "{{ vm_password }}"
add_user_sudo: True
add_user_groups:
- "{{ vm_user }}"
- sudo
add_user_passwordless_sudo: true

# Note: it is important to pass variables to roles using the 'vars' dictionary.
# If variables are passed on the same indentation level as the role, the variable is
Expand All @@ -34,12 +38,6 @@
- name: set up the VM
hosts: default
become: True
become_user: "{{ vm_user }}"
pre_tasks:
- name: import global variables
tags: always
include_vars:
file: globalconfig.yml
vars:
- release_notes: True
- run_tests: False
Expand Down Expand Up @@ -80,43 +78,26 @@
slurm_hostname: "{{ vm_hostname }}"
slurm_cpus: "{{ vm_cpus }}"
slurm_memory: "{{ vm_memory }}"
# - role: marvel-nccr.torque
# tags: torque
# vars:
# torque_hostname: "{{ vm_hostname }}"
# torque_cpus: "{{ vm_cpus }}"
- role: marvel-nccr.quantum_espresso
tags: quantum_espresso
vars:
quantum_espresso_code_folder: "{{ vm_codes_folder }}"
- role: marvel-nccr.yambo
tags: yambo
vars:
yambo_code_folder: "{{ vm_codes_folder }}"
- role: marvel-nccr.fleur
tags: fleur
vars:
fleur_code_folder: "{{ vm_codes_folder }}"
- role: marvel-nccr.siesta
tags: siesta
vars:
siesta_code_folder: "{{ vm_codes_folder }}"
- role: marvel-nccr.cp2k
tags: cp2k
vars:
cp2k_code_folder: "{{ vm_codes_folder }}"
- role: marvel-nccr.wannier90
tags: wannier90
vars:
wannier90_code_folder: "{{ vm_codes_folder }}"
- role: marvel-nccr.aiida
tags: aiida
vars:
aiida_code_folder: "{{ vm_codes_folder }}"
aiida_localhost_cpus: "{{ vm_cpus }}"
aiida_localhost_scheduler: "{{ vm_scheduler }}"
aiida_examples_folder: "{{ vm_examples_folder }}"
# - role: marvel-nccr.aiidalab
# tags: aiidalab
# vars:
# aiidalab_headless: "{{ vm_headless }}"
- role: marvel-nccr.aiidalab
tags: aiidalab
vars:
aiidalab_headless: "{{ vm_headless }}"
26 changes: 13 additions & 13 deletions requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@
- src: marvel-nccr.current_user
version: v0.1.0
- src: marvel-nccr.add_user
version: v0.1.0
version: v0.2.1
- src: marvel-nccr.simulationbase
version: v0.1.0
version: v0.1.1
- src: marvel-nccr.ubuntu_desktop
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.quantum_mobile_customizations
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.editors
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.slurm
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.quantum_espresso
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.yambo
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.fleur
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.siesta
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.cp2k
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.wannier90
version: v0.1.0
version: v1.0.0
- src: marvel-nccr.aiida
version: develop
version: v0.1.0
- src: marvel-nccr.aiidalab
version: v0.1.0

0 comments on commit abc92f4

Please sign in to comment.