Browse Source

Specify real host names and clean up tasks

Matthias Vogelgesang 9 years ago
parent
commit
6c31265b42

+ 0 - 1
.gitignore

@@ -1 +0,0 @@
-hosts

+ 16 - 0
hosts

@@ -0,0 +1,16 @@
+[common]
+ankatoto-ufo1.anka.kit.edu      # aka ufosrv1
+ankaimageufo2.anka.kit.edu      # aka ufosrv2
+
+[staging-compute]
+ankatoto-ufo1.anka.kit.edu
+
+[production-compute]
+ankaimageufo2.anka.kit.edu
+
+[control]
+ankaimageufo2.anka.kit.edu
+
+[detectors]
+
+[nvidia]

+ 0 - 16
hosts.sample

@@ -1,16 +0,0 @@
-[staging-compute]
-compute1
-compute2
-ufosrv
-
-[production-compute]
-camlin
-
-[control]
-image-cam
-camlin
-
-[detectors]
-ufosrv
-camlin
-image-cam

+ 0 - 3
roles/common/tasks/main.yml

@@ -21,8 +21,5 @@
 - name: add ufo-kit repo
   zypper_repository: name=repo-ufo-kit repo={{ our_suse_repo }}
 
-- name: refresh ufo-kit repo
-  command: zypper --gpg-auto-import-keys ref repo-ufo-kit
-
 - name: set up a sane .bashrc
   copy: src=bashrc dest=/root/.bashrc force=no

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

@@ -1,4 +1,7 @@
 ---
+- name: refresh ufo-kit repo
+  command: zypper --gpg-auto-import-keys ref repo-ufo-kit
+
 - name: install ufo
   zypper: name={{ item }} state=latest
   with_items:

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

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

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

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

+ 8 - 0
setup.yml

@@ -1,4 +1,12 @@
 ---
+- hosts: common
+  vars_files:
+    - vars/{{ ansible_os_family }}.yml
+  roles:
+    - common
+  tags:
+    - common
+
 - hosts: staging-compute
   vars_files:
     - vars/{{ ansible_os_family }}.yml