Bläddra i källkod

ffrl tools are now installable on all supported OS

Till Klocke 9 år sedan
förälder
incheckning
a0ac8d97fd

+ 2 - 1
roles/ff-supernode/defaults/main.yml

@@ -2,4 +2,5 @@
 # defaults file for ff-supernode
 supernode_local_ip: ansible_default_ipv4.address
 supernode_freifunk_tools_repo: https://github.com/ffrl/ff-tools.git
-supernode_freifunk_tools_dir: /src/ff-tools
+supernode_freifunk_tools_dir: /src/ff-tools
+supernode_pip_executable: pip3

+ 4 - 1
roles/ff-supernode/tasks/main.yml

@@ -1,6 +1,9 @@
 ---
 # tasks file for ff-supernode
 
+- include_vars: "{{ ansible_distribution }}-{{ansible_distribution_release }}.yml"
+  when: ansible_distribution_release == 'wheezy' and ansible_distribution == 'Debian'
+
 - include: debian.yml
   when: ansible_distribution == 'Debian'
 
@@ -25,7 +28,7 @@
   template: src=ntp.conf.j2 dest=/etc/ntp.conf
 
 - name: Install python dependencies for ffrl tools
-  pip: name={{item}} executable=pip3
+  pip: name={{item}} executable={{supernode_pip_executable}}
   with_items:
   - pyroute2
 

+ 1 - 0
roles/ff-supernode/vars/Debian-wheezy.yml

@@ -0,0 +1 @@
+supernode_pip_executable: pip-3.2