Some more hiera work

data/common.yaml

@@ -9,24 +9,28 @@ lookup_options:
   quagga::prefix_lists:
     merge:
       strategy: deep
+  quagga::route_maps:
+    merge:
+      strategy: deep
   quagga::bgp::router:
     merge:
       strategy: hash
   quagga::bgp::peers:
     merge:
       strategy: deep
-  quagga::bgp::route_maps:
-    merge:
-      strategy: deep
   quagga::bgp::as_paths:
     merge:
       strategy: deep
   quagga::bgp::community_lists:
     merge:
       strategy: deep
+  quagga::bgp::address_families:
+    merge:
+      strategy: deep
 quagga::global_opts: {}
 quagga::interfaces: {}
 quagga::prefix_lists: {}
+quagga::route_maps: {}
 quagga::default_owner: "quagga"
 quagga::default_group: "quagga"
 quagga::default_mode: "0600"
@@ -59,9 +63,9 @@ quagga::bgp::service_ensure: "running"
 quagga::bgp::service_opts: "-P 0"
 quagga::bgp::router: {}
 quagga::bgp::peers: {}
-quagga::bgp::route_maps: {}
 quagga::bgp::as_paths: {}
 quagga::bgp::community_lists: {}
+quagga::bgp::address_families: {}
 quagga::ospf::config_file: "%{lookup('quagga::config_dir')}/ospfd.conf"
 quagga::ospf::config_file_manage: true
 quagga::ospf::service_name: "ospfd"

lib/puppet/provider/quagga_as_path/quagga.rb → lib/puppet/provider/quagga_bgp_as_path/quagga.rb

@@ -1,4 +1,4 @@
-Puppet::Type.type(:quagga_as_path).provide :quagga do
+Puppet::Type.type(:quagga_bgp_as_path).provide :quagga do
   @doc = %q{
     Manages as-path access-list using quagga.
   }
@@ -104,4 +104,4 @@ def rules=(value)
 
     @property_hash[:rules] = value
   end
-end
+end

lib/puppet/provider/quagga_community_list/quagga.rb → lib/puppet/provider/quagga_bgp_community_list/quagga.rb

@@ -1,4 +1,4 @@
-Puppet::Type.type(:quagga_community_list).provide :quagga do
+Puppet::Type.type(:quagga_bgp_community_list).provide :quagga do
   @doc = 'Manages a community-list using quagga.'
 
   commands :vtysh => 'vtysh'
@@ -108,4 +108,4 @@ def rules=(value)
 
     @property_hash[:rules] = value
   end
-end
+end

lib/puppet/type/quagga_as_path.rb → lib/puppet/type/quagga_bgp_as_path.rb

@@ -1,10 +1,10 @@
-Puppet::Type.newtype(:quagga_as_path) do
+Puppet::Type.newtype(:quagga_bgp_as_path) do
   @doc = %q{
-    This type provides the capabilities to manage as-path access-list within puppet.
+    This type provides the capabilities to manage BGP as-path access-list within puppet.
 
       Examples:
 
-        quagga_as_path { 'as100':
+        quagga_bgp_as_path { 'as100':
             ensure => present,
             rules => [
                 'permit _100$',
@@ -42,4 +42,4 @@ def should_to_s(newvalue = @should)
   autorequire(:service) do
     %w{zebra bgpd}
   end
-end
+end

lib/puppet/type/quagga_community_list.rb → lib/puppet/type/quagga_bgp_community_list.rb

@@ -1,12 +1,11 @@
-Puppet::Type.newtype(:quagga_community_list) do
+Puppet::Type.newtype(:quagga_bgp_community_list) do
   @doc = %q{
 
-    This type provides the capability to manage community-list
-    within puppet.
+    This type provides the capability to manage BGP community-list within puppet.
 
       Examples:
 
-        quagga_community_list { '100':
+        quagga_bgp_community_list { '100':
             ensure => present,
             rules  => [
                 'permit 65000:50952',
@@ -51,4 +50,4 @@ def should_to_s(value = @should)
   autorequire(:service) do
     %w{zebra bgpd}
   end
-end
+end

manifests/bgp.pp

@@ -6,11 +6,12 @@
   Boolean $service_manage,
   Enum["running", "stopped"] $service_ensure,
   String $service_opts,
+  Optional[Integer] $as_number = undef,
   Hash $router,
   Hash $peers,
-  Hash $route_maps,
   Hash $as_paths,
-  Hash $community_lists
+  Hash $community_lists,
+  Hash $address_families
 ) {
   include quagga::bgp::config
   include quagga::bgp::service
@@ -20,33 +21,37 @@
     fail("Quagga only supports a single BGP router instance in ${title}")
   }
 
-  $router.each |String $router_name, Hash $router| {
-    quagga_bgp {$router_name:
+  if $service_enable and $service_ensure == 'running' {
+    unless $as_number {
+      fail("Must specify BGP AS router number when service is enabled")
+    }
+
+    quagga_bgp {$as_number:
       * => $router
     }
-  }
 
-  $peers.each |String $peer_name, Hash $peer| {
-    quagga_bgp_peer {$peer_name:
-      * => $peer
+    $peers.each |String $peer_name, Hash $peer| {
+      quagga_bgp_peer {"$as_number $peer_name":
+        * => $peer
+      }
     }
-  }
 
-  $route_maps.each |String $route_map_name, Hash $route_map| {
-    quagga_route_map {$route_map_name:
-      * => $route_map
+    $as_paths.each |String $as_path_name, Hash $as_path| {
+      quagga_bgp_as_path {$as_path_name:
+        * => $as_path
+      }
     }
-  }
 
-  $as_paths.each |String $as_path_name, Hash $as_path| {
-    quagga_as_path {$as_path_name:
-      * => $as_path
+    $community_lists.each |String $community_list_name, Hash $community_list| {
+      quagga_bgp_community_list {$community_list_name:
+        * => $community_list
+      }
     }
-  }
 
-  $community_lists.each |String $community_list_name, Hash $community_list| {
-    quagga_community_list {$community_list_name:
-      * => $community_list
+    $address_families.each |String $address_family_name, Hash $address_family| {
+      quagga_bgp_address_family {"$as_number $address_family_name":
+        * => $address_family
+      }
     }
   }
 }

manifests/init.pp

@@ -2,6 +2,7 @@
   Hash $global_opts,
   Hash $interfaces,
   Hash $prefix_lists,
+  Hash $route_maps,
   String $default_owner,
   String $default_group,
   String $default_mode,
@@ -56,4 +57,10 @@
       * => $prefix_list
     }
   }
+
+  $route_maps.each |String $route_map_name, Hash $route_map| {
+    quagga_route_map {$route_map_name:
+      * => $route_map
+    }
+  }
 }