Browse Source

Use role dependencies and goodies from 1.4

Matthias Vogelgesang 10 years ago
parent
commit
f1abf773f3

+ 2 - 4
roles/common/tasks/main.yml

@@ -18,13 +18,11 @@
     - virtualenvwrapper
 
 - name: add ANKA repo
-  command: zypper ar -f -G "${anka_suse_repo}" repo-anka
-           creates=/etc/zypp/repos.d/repo-anka.repo
+  zypper_repository: name=repo-anka repo={{ anka_suse_repo }}
   when: is_open_suse
 
 - name: add ufo-kit repo
-  command: zypper ar -f -G "${our_suse_repo}" repo-ufo-kit
-           creates=/etc/zypp/repos.d/repo-ufo-kit.repo
+  zypper_repository: name=repo-ufo-kit repo={{ our_suse_repo }}
   when: is_open_suse
 
 - name: refresh ufo-kit repo

+ 3 - 0
roles/compute-production/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: compute }

+ 4 - 0
roles/compute-staging/meta/main.yml

@@ -0,0 +1,4 @@
+---
+dependencies:
+  - { role: devel }
+  - { role: compute }

+ 3 - 0
roles/compute/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: common }

+ 3 - 0
roles/control/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: common }

+ 3 - 0
roles/detector/meta/main.yml

@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: common }

+ 2 - 3
roles/nvidia/tasks/main.yml

@@ -6,8 +6,7 @@
     - kernel-devel
 
 - name: add nvidia repo
-  command: zypper ar -f -G "${nvidia_suse_repo}" repo-nvidia
-           creates=/etc/zypp/repos.d/repo-nvidia.repo
+  zypper_repository: name=repo-nvidia repo={{ nvidia_suse_repo }}
   when: is_open_suse
 
 - name: refresh nvidia repo
@@ -18,7 +17,7 @@
   modprobe: name=nouveau state=absent
 
 - name: blacklist nouveau
-  blacklist: name=nouveau state=present
+  kernel_blacklist: name=nouveau state=present
 
 - name: install nvidia drivers
   zypper: name={{ item }}

+ 0 - 11
setup.yml

@@ -1,46 +1,35 @@
 ---
 - hosts: staging-compute
-  sudo: yes
   vars_files:
     - vars.yml
   roles:
-    - devel
-    - compute
     - compute-staging
   tags:
     - compute
 
 - hosts: production-compute
-  sudo: yes
   vars_files:
     - vars.yml
   roles:
-    - common
-    - compute
     - compute-production
   tags:
     - compute
 
 - hosts: control
-  sudo: yes
   vars_files:
     - vars.yml
   roles:
-    - common
     - control
 
 - hosts: detectors
-  sudo: yes
   vars_files:
     - vars.yml
   roles:
-    - common
     - detector
   tags:
     - detector
 
 - hosts: nvidia
-  sudo: yes
   vars_files:
     - vars.yml
   roles: