Преглед на файлове

Now installing, configuring and testing ntp. Also we install a custom reolv.conf and uninstall resolvconf package from Ubunut

Till Klocke преди 9 години
родител
ревизия
d5fb591a8e
променени са 3 файла, в които са добавени 11 реда и са изтрити 115 реда
  1. 3 0
      roles/ff-supernode/tasks/debian.yml
  2. 8 0
      roles/ff-supernode/templates/resolv.conf.j2
  3. 0 115
      test/application/supernode_pkg_vars.yml

+ 3 - 0
roles/ff-supernode/tasks/debian.yml

@@ -5,6 +5,9 @@
   - supervisor
   - ntp
 
+- name: Remove resolvconf from Ubunut
+  apt: name=resolvconf state=absent
+
 - name: Install backport kernel for Debian wheezy
   apt: name=linux-image-amd64 default_release=wheezy-backports state=latest
   when: ansible_distribution_release == 'wheezy'

+ 8 - 0
roles/ff-supernode/templates/resolv.conf.j2

@@ -0,0 +1,8 @@
+#
+# This file is managed by ansible. Do no edit by hand!
+#
+
+nameserver 8.8.8.8
+nameserver 8.8.4.4
+nameserver 2001:4860:4860::8888
+nameserver 2001:4860:4860::8844

+ 0 - 115
test/application/supernode_pkg_vars.yml

@@ -63,121 +63,6 @@ fastd_instances_secret:
   - name: do01
     secret: 280088c4263359417e9f2daf1771db820ab79eb4f79e3718719b2a976e8a8b5e
 
-bird_router_id: "{{supernode_mesh_ipv4}}"
-bird_templates:
-  - header: bgp ibgp
-    content: |
-      local as 65403;
-      import all;
-      export all;
-      next hop self;
-      multihop 64;
-
-bird_protocols:
-  - header: kernel
-    content: |
-      device routes;
-      import all;
-      export all;
-      kernel table 42;
-  - header: device
-    content: scan time 8;
-  - header: direct
-    content: interface "*";
-  - header: bgp ffrg11 from ibgp
-    content: |
-      source address 10.0.6.6;
-      neighbor 10.0.6.5 as 65079;
-      default bgp_med 2;
-  - header: bgp ffrg25 from ibgp
-    content: |
-      source address 10.0.6.2;
-      neighbor 10.0.6.1 as 65079;
-      default bgp_med 1;
-  - header: bgp node012 from ibgp
-    content: |
-      source address 10.233.8.1;
-      neighbor 10.233.24.1 as 65403;
-      default bgp_med 4;
-  - header: bgp node021 from ibgp
-    content: |
-      source address 10.233.8.1;
-      neighbor 10.233.16.1 as 65403;
-      default bgp_med 3;
-  - header: bgp node022 from ibgp
-    content: |
-      source address 10.233.8.1;
-      neighbor 10.233.32.1 as 65403;
-      default bgp_med 4;
-  - header: bgp map from ibgp
-    content: |
-      source address 10.233.8.1;
-      neighbor 10.233.0.1 as 65403;
-      default bgp_med 4;
-
-
-bird6_router_id: "{{supernode_mesh_ipv4}}"
-bird6_templates:
-  - header: bgp ibgp
-    content: |
-      source address 2a03:2260:50:5::8;
-      local as 65403;
-      import all;
-      export all;
-      next hop self;
-      direct;
-      gateway direct;
-  - header: bgp uplink
-    content: |
-      local as 65403;
-      import all;
-      export all;
-      next hop self;
-      direct;
-      multihop 64;
-
-bird6_protocols:
-  - header: static uplink_hostroute
-    content: |
-      import all;
-      export all;
-  - header: direct
-    content: interface "*";
-  - header: kernel
-    content: |
-      persist;
-      device routes;
-      scan time 20;
-      import all;
-      export all;
-      kernel table 42;
-  - header: device
-    content: scan time 10;
-  - header: bgp ffrg11 from uplink
-    content: |
-      neighbor 2a03:2260:50:5b::1 as 65079;
-      default bgp_med 2;
-  - header: bgp ffrg25 from uplink
-    content: |
-      neighbor 2a03:2260:50:5a::1 as 65079;
-      default bgp_med 1;
-  - header: bgp node012 from ibgp
-    content: |
-      neighbor 2a03:2260:50:5::24 as 65403;
-      default bgp_med 4;
-  - header: bgp node021 from ibgp
-    content: |
-      neighbor 2a03:2260:50:5::16 as 65403;
-      default bgp_med 3;
-  - header: bgp node022 from ibgp
-    content: |
-      neighbor 2a03:2260:50:5::32 as 65403;
-      default bgp_med 4;
-  - header: bgp map from ibgp
-    content: |
-      neighbor 2a03:2260:50:5::1 as 65403;
-      default bgp_med 4;
-
 supernode_interfaces:
   - name: eth0
     auto: true