Browse Source

Use distri-specific vars file

Matthias Vogelgesang 10 years ago
parent
commit
bd42fc79a3
4 changed files with 14 additions and 6 deletions
  1. 2 3
      roles/compute-staging/handlers/main.yml
  2. 5 0
      setup.yml
  3. 0 3
      vars.yml
  4. 7 0
      vars/Suse.yml

+ 2 - 3
roles/compute-staging/handlers/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: configure ufo-core
-  command: chdir=/opt/ufo-core cmake .
+  command: chdir=/opt/ufo-core cmake . -DPREFIX={{ install_prefix }} -DLIBDIR={{ libdir }}
   notify:
     - build ufo-core
 
@@ -8,13 +8,12 @@
   command: chdir=/opt/ufo-core make
   notify:
     - install ufo-core
-    - update typelib
 
 - name: install ufo-core
   command: chdir=/opt/ufo-core make install
 
 - name: configure ufo-filters
-  command: chdir=/opt/ufo-filters cmake .
+  command: chdir=/opt/ufo-filters cmake . -DPREFIX={{ install_prefix }} -DLIBDIR={{ libdir }}
   notify:
     - build ufo-filters
 

+ 5 - 0
setup.yml

@@ -2,6 +2,7 @@
 - hosts: staging-compute
   vars_files:
     - vars.yml
+    - vars/{{ ansible_os_family }}.yml
   roles:
     - compute-staging
   tags:
@@ -10,6 +11,7 @@
 - hosts: production-compute
   vars_files:
     - vars.yml
+    - vars/{{ ansible_os_family }}.yml
   roles:
     - compute-production
   tags:
@@ -18,12 +20,14 @@
 - hosts: control
   vars_files:
     - vars.yml
+    - vars/{{ ansible_os_family }}.yml
   roles:
     - control
 
 - hosts: detectors
   vars_files:
     - vars.yml
+    - vars/{{ ansible_os_family }}.yml
   roles:
     - detector
   tags:
@@ -32,6 +36,7 @@
 - hosts: nvidia
   vars_files:
     - vars.yml
+    - vars/{{ ansible_os_family }}.yml
   roles:
     - nvidia
   tags:

+ 0 - 3
vars.yml

@@ -1,5 +1,2 @@
 ---
 is_open_suse: "'ansible_os_family' == 'Suse'"
-our_suse_repo: "http://download.opensuse.org/repositories/home:/ufo-kit/openSUSE_{{ ansible_distribution_version }}"
-anka_suse_repo: "http://iss-repo.ka.fzk.de/anka/suse-{{ ansible_distribution_version }}/RPMS"
-nvidia_suse_repo: "ftp://download.nvidia.com/opensuse/{{ ansible_distribution_version }}"

+ 7 - 0
vars/Suse.yml

@@ -0,0 +1,7 @@
+---
+our_suse_repo: "http://download.opensuse.org/repositories/home:/ufo-kit/openSUSE_{{ ansible_distribution_version }}"
+anka_suse_repo: "http://iss-repo.ka.fzk.de/anka/suse-{{ ansible_distribution_version }}/RPMS"
+nvidia_suse_repo: "ftp://download.nvidia.com/opensuse/{{ ansible_distribution_version }}"
+
+install_prefix: "/usr"
+libdir: "/usr/lib64"