Browse Source

Further refactoring

Till Klocke 9 years ago
parent
commit
d79509aed0

+ 1 - 1
Vagrantfile

@@ -62,7 +62,7 @@ Vagrant.configure("2") do |config|
     end
 
     node.vm.provision :ansible do |ansible|
-      ansible.playbook = "playbook.yml"
+      ansible.playbook = "playbooks/mapserver.yml"
 
       ansible.groups = {
         "mapservers" => ["mapserver"]

+ 0 - 1
playbooks/host_vars/mapserver/host.yml

@@ -1,5 +1,4 @@
 local_node: "{{supernodes[2]}}"
-ffmap_backend_version: v2
 
 supernode_mesh_mac: "{{local_node.mesh_mac}}"
 supernode_mesh_ipv4: "{{local_node.mesh_ip_v4}}"

+ 2 - 0
playbooks/mapserver.yml

@@ -1,4 +1,6 @@
 ---
 - hosts: mapservers
   roles:
+  - batman
+  - supernode-interfaces
   - map-server

+ 0 - 2
roles/internal/map-server/meta/main.yml

@@ -18,7 +18,5 @@ galaxy_info:
   - system
   - web
 dependencies:
-- batman
 - jdauphant.nginx
 - meshviewer
-- supernode-interfaces