ソースを参照

Added basic mapserver which is already at least part of the mesh

Till Klocke 9 年 前
コミット
32ae77677a

+ 2 - 2
Vagrantfile

@@ -52,7 +52,7 @@ Vagrant.configure("2") do |config|
 
 
   config.vm.define "mapserver" do |node|
   config.vm.define "mapserver" do |node|
     node.vm.box = "ARTACK/debian-jessie"
     node.vm.box = "ARTACK/debian-jessie"
-    node.vm.hostname = "map"
+    node.vm.hostname = "mapserver"
     node.vm.network "private_network", ip: "192.168.77.29"
     node.vm.network "private_network", ip: "192.168.77.29"
 
 
     node.vm.provider :virtualbox do |vb|
     node.vm.provider :virtualbox do |vb|
@@ -67,7 +67,7 @@ Vagrant.configure("2") do |config|
       ansible.playbook = "playbook.yml"
       ansible.playbook = "playbook.yml"
 
 
       ansible.groups = {
       ansible.groups = {
-        "uplinks" => ["uplink01"]
+        "mapservers" => ["mapserver"]
       }
       }
     end
     end
   end
   end

ファイルの差分が大きいため隠しています
+ 9 - 9
group_vars/all/supernodes.yml


+ 41 - 0
host_vars/mapserver/host.yml

@@ -0,0 +1,41 @@
+local_node: "{{supernodes[2]}}"
+
+supernode_mesh_mac: "{{local_node.mesh_mac}}"
+supernode_mesh_ipv4: "{{local_node.mesh_ip_v4}}"
+supernode_bat_macaddress: "{{local_node.bat_mac}}"
+supernode_mesh_ipv6: "{{local_node.mesh_ip_v6}}"
+supernode_local_ip: "{{local_node.public_ip|default(ansible_default_ipv4.address)}}"
+supernode_public_interface: "{{local_node.public_interface|default(ansible_default_ipv4.interface)}}"
+supernode_dhcp_range_start: "{{local_node.dhcp_range_start}}"
+supernode_dhcp_range_end: "{{local_node.dhcp_range_end}}"
+
+supernode_mesh_backbones:
+  - name: "{{supernodes[0].name}}"
+    remote_ip: "{{supernodes[0].public_ip|ipaddr('address')}}"
+    mesh_ip: "{{supernodes[0].mesh_ip_v4|ipaddr('address')}}"
+    address_v6: "{{supernodes[0].mesh_ip_v6|ipaddr('address')}}"
+    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
+    interface: "{{supernode_public_interface}}"
+  - name: "{{supernodes[1].name}}"
+    remote_ip: "{{supernodes[1].public_ip|ipaddr('address')}}"
+    mesh_ip: "{{supernodes[1].mesh_ip_v4|ipaddr('address')}}"
+    address_v6: "{{supernodes[1].mesh_ip_v6|ipaddr('address')}}"
+    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
+    interface: "{{supernode_public_interface}}"
+
+supernode_interfaces:
+  - name: eth0
+    auto: true
+    proto: inet
+    type: dhcp
+  - name: eth1
+    auto: true
+    proto: inet
+    type: static
+    config:
+    - key: address
+      value: "{{supernode_local_ip|ipaddr('address')}}"
+    - key: netmask
+      value: "{{supernode_local_ip|ipaddr('netmask')}}"
+    - key: broadcast
+      value: "{{supernode_local_ip|ipaddr('broadcast')}}"

+ 6 - 0
host_vars/node01/supernode

@@ -16,6 +16,12 @@ supernode_mesh_backbones:
     address_v6: "{{supernodes[1].mesh_ip_v6|ipaddr('address')}}"
     address_v6: "{{supernodes[1].mesh_ip_v6|ipaddr('address')}}"
     local_ip: "{{supernode_local_ip|ipaddr('address')}}"
     local_ip: "{{supernode_local_ip|ipaddr('address')}}"
     interface: "{{supernode_public_interface}}"
     interface: "{{supernode_public_interface}}"
+  - name: "{{supernodes[2].name}}"
+    remote_ip: "{{supernodes[2].public_ip|ipaddr('address')}}"
+    mesh_ip: "{{supernodes[2].mesh_ip_v4|ipaddr('address')}}"
+    address_v6: "{{supernodes[2].mesh_ip_v6|ipaddr('address')}}"
+    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
+    interface: "{{supernode_public_interface}}"
 
 
 supernode_other_nameserver: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 supernode_other_nameserver: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 supernode_other_ntp_server: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 supernode_other_ntp_server: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"

+ 6 - 0
host_vars/node02/supernode

@@ -16,6 +16,12 @@ supernode_mesh_backbones:
     address_v6: "{{supernodes[0].mesh_ip_v6|ipaddr('address')}}"
     address_v6: "{{supernodes[0].mesh_ip_v6|ipaddr('address')}}"
     local_ip: "{{supernode_local_ip|ipaddr('address')}}"
     local_ip: "{{supernode_local_ip|ipaddr('address')}}"
     interface: "{{supernode_public_interface}}"
     interface: "{{supernode_public_interface}}"
+  - name: "{{supernodes[2].name}}"
+    remote_ip: "{{supernodes[2].public_ip|ipaddr('address')}}"
+    mesh_ip: "{{supernodes[2].mesh_ip_v4|ipaddr('address')}}"
+    address_v6: "{{supernodes[2].mesh_ip_v6|ipaddr('address')}}"
+    local_ip: "{{supernode_local_ip|ipaddr('address')}}"
+    interface: "{{supernode_public_interface}}"
 
 
 supernode_other_nameserver: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 supernode_other_nameserver: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 supernode_other_ntp_server: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"
 supernode_other_ntp_server: "{{supernode_mesh_backbones|map(attribute='mesh_ip')|map('ipaddr','address')|join(' ')}}"

+ 6 - 1
playbook.yml

@@ -6,4 +6,9 @@
 - hosts: uplinks
 - hosts: uplinks
   sudo: yes
   sudo: yes
   roles:
   roles:
-  - test-uplink
+  - test-uplink
+
+- hosts: mapservers
+  sudo: yes
+  roles:
+  - map-server

+ 38 - 0
roles/map-server/README.md

@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).

+ 2 - 0
roles/map-server/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+# defaults file for map-server

+ 2 - 0
roles/map-server/handlers/main.yml

@@ -0,0 +1,2 @@
+---
+# handlers file for map-server

+ 138 - 0
roles/map-server/meta/main.yml

@@ -0,0 +1,138 @@
+---
+galaxy_info:
+  author: your name
+  description: 
+  company: your company (optional)
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+  # Some suggested licenses:
+  # - BSD (default)
+  # - MIT
+  # - GPLv2
+  # - GPLv3
+  # - Apache
+  # - CC-BY
+  license: license (GPLv2, CC-BY, etc)
+  min_ansible_version: 1.2
+  #
+  # Below are all platforms currently available. Just uncomment
+  # the ones that apply to your role. If you don't see your 
+  # platform on this list, let us know and we'll get it added!
+  #
+  #platforms:
+  #- name: EL
+  #  versions:
+  #  - all
+  #  - 5
+  #  - 6
+  #  - 7
+  #- name: GenericUNIX
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Fedora
+  #  versions:
+  #  - all
+  #  - 16
+  #  - 17
+  #  - 18
+  #  - 19
+  #  - 20
+  #  - 21
+  #  - 22
+  #- name: Windows
+  #  versions:
+  #  - all
+  #  - 2012R2
+  #- name: SmartOS
+  #  versions:
+  #  - all
+  #  - any
+  #- name: opensuse
+  #  versions:
+  #  - all
+  #  - 12.1
+  #  - 12.2
+  #  - 12.3
+  #  - 13.1
+  #  - 13.2
+  #- name: Amazon
+  #  versions:
+  #  - all
+  #  - 2013.03
+  #  - 2013.09
+  #- name: GenericBSD
+  #  versions:
+  #  - all
+  #  - any
+  #- name: FreeBSD
+  #  versions:
+  #  - all
+  #  - 8.0
+  #  - 8.1
+  #  - 8.2
+  #  - 8.3
+  #  - 8.4
+  #  - 9.0
+  #  - 9.1
+  #  - 9.1
+  #  - 9.2
+  #- name: Ubuntu
+  #  versions:
+  #  - all
+  #  - lucid
+  #  - maverick
+  #  - natty
+  #  - oneiric
+  #  - precise
+  #  - quantal
+  #  - raring
+  #  - saucy
+  #  - trusty
+  #  - utopic
+  #  - vivid
+  #- name: SLES
+  #  versions:
+  #  - all
+  #  - 10SP3
+  #  - 10SP4
+  #  - 11
+  #  - 11SP1
+  #  - 11SP2
+  #  - 11SP3
+  #- name: GenericLinux
+  #  versions:
+  #  - all
+  #  - any
+  #- name: Debian
+  #  versions:
+  #  - all
+  #  - etch
+  #  - jessie
+  #  - lenny
+  #  - squeeze
+  #  - wheezy
+  #
+  # Below are all categories currently available. Just as with
+  # the platforms above, uncomment those that apply to your role.
+  #
+  #categories:
+  #- cloud
+  #- cloud:ec2
+  #- cloud:gce
+  #- cloud:rax
+  #- clustering
+  #- database
+  #- database:nosql
+  #- database:sql
+  #- development
+  #- monitoring
+  #- networking
+  #- packaging
+  #- system
+  #- web
+dependencies:
+- batman
+- alfred
+- supernode-interfaces

+ 2 - 0
roles/map-server/tasks/main.yml

@@ -0,0 +1,2 @@
+---
+# tasks file for map-server

+ 2 - 0
roles/map-server/vars/main.yml

@@ -0,0 +1,2 @@
+---
+# vars file for map-server