-- and portalnet to both

SchwarzM · Aug 23, 2015 · 1177d6a · 1177d6a
1 parent 644259a
commit 1177d6a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -7,7 +7,7 @@ RUN apk-install quagga \
                 supervisor
 
 ADD supervisord.conf /etc/supervisord.conf
-ADD https://github.com/SchwarzM/k8s-quagga/releases/download/v0.0.2/k8s-quagga_linux_amd64 /k8s-quagga
+ADD https://github.com/SchwarzM/k8s-quagga/releases/download/v0.0.3/k8s-quagga_linux_amd64 /k8s-quagga
 RUN chmod +x /k8s-quagga
 ADD run.sh /run.sh
 RUN chmod +x /run.sh

diff --git a/main.go b/main.go
@@ -13,6 +13,7 @@ type ospfconfig struct {
   Interface string
   RouterId string
   HomeNet string
+  PortalNet string
   ContainerNet string
 }
 
@@ -41,6 +42,7 @@ router ospf
   log-adjacency-changes detail
   default-information originate
   network {{.HomeNet}} area 0.0.0.0
+  network {{.PortalNet}} area 0.0.0.0
   network {{.ContainerNet}} area 0.0.0.0
 `
 
@@ -52,7 +54,7 @@ func check(e error) {
 
 func main() {
   app := cli.NewApp()
-  app.Version = "0.0.2"
+  app.Version = "0.0.3"
   app.Flags = []cli.Flag {
     cli.StringFlag{
       Name: "output",
@@ -87,6 +89,11 @@ func main() {
           Value: "10.2.0.0/24",
           Usage: "Container Network CIDR",
         },
+        cli.StringFlag{
+          Name: "PortalNet",
+          Value: "10.2.0.0/24",
+          Usage: "Portal Network CIDR",
+        },
         cli.StringFlag{
           Name: "HomeNet",
           Value: "10.0.1.0/24",
@@ -99,6 +106,7 @@ func main() {
           Interface: c.String("Interface"),
           RouterId: c.String("RouterId"),
           HomeNet: c.String("HomeNet"),
+          PortalNet: c.String("PortalNet"),
           ContainerNet: c.String("ContainerNet"),
         }
         f, err := os.Create(path.Join(c.GlobalString("output"), "ospfd.conf"))