From 85ddb637143e884ae0b2989badd5a7b2f65df9ae Mon Sep 17 00:00:00 2001
From: Emma Gordon <emma@projectcalico.org>
Date: Wed, 8 Jul 2015 17:45:41 +0100
Subject: [PATCH] Configure the route reflector to peer with compute nodes
 only, not all nodes

Change-Id: I24a81e0f3e000bce9209d4acba74a53375308628
---
 deployment_scripts/calico_route_reflector.sh |  6 ++---
 deployment_scripts/get_node_ip.py            | 21 +-----------------
 deployment_scripts/get_rr_peers.py           | 23 ++++++++++++++++++++
 deployment_scripts/pluginutils.py            | 23 ++++++++++++++++++++
 4 files changed, 50 insertions(+), 23 deletions(-)
 create mode 100755 deployment_scripts/get_rr_peers.py
 create mode 100755 deployment_scripts/pluginutils.py

diff --git a/deployment_scripts/calico_route_reflector.sh b/deployment_scripts/calico_route_reflector.sh
index 301d5e0..a04982a 100755
--- a/deployment_scripts/calico_route_reflector.sh
+++ b/deployment_scripts/calico_route_reflector.sh
@@ -7,9 +7,9 @@ set -x
 
 echo "Hi, I'm a route_reflector node!"
 
-this_node_address=$(grep `hostname` /etc/hosts | awk '{print $1;}')
+this_node_address=$(python get_node_ip.py `hostname`)
 
-all_nodes=$(grep node- /etc/hosts | awk '{print $1;}')
+bgp_peers=$(python get_rr_peers.py)
 
 # Generate basic config for a BIRD BGP route reflector.
 cat > /etc/bird/bird.conf <<EOF
@@ -39,7 +39,7 @@ protocol device {
 EOF
 
 # Add a BGP protocol stanza for each compute node.
-for node in $all_nodes; do
+for node in $bgp_peers; do
     if [ $node != $this_node_address ]; then
         cat >> /etc/bird/bird.conf <<EOF
 
diff --git a/deployment_scripts/get_node_ip.py b/deployment_scripts/get_node_ip.py
index ffcb328..2b47fb5 100755
--- a/deployment_scripts/get_node_ip.py
+++ b/deployment_scripts/get_node_ip.py
@@ -1,31 +1,12 @@
 #!/usr/bin/env python
 # Copyright 2015 Metaswitch Networks
 
-import os
 import sys
 import yaml
+from pluginutils import get_config_file_for_node_type
 
 usage = "./get_node_ip.py <hostname>"
 
-PRIMARY_CONTROLLER_CFG = "/etc/primary-controller.yaml"
-CONTROLLER_CFG = "/etc/controller.yaml"
-COMPUTE_CFG = "/etc/compute.yaml"
-
-def get_config_file_for_node_type():
-    if os.path.isfile(PRIMARY_CONTROLLER_CFG):
-        config_file = PRIMARY_CONTROLLER_CFG
-
-    elif os.path.isfile(CONTROLLER_CFG):
-        config_file = CONTROLLER_CFG
-
-    elif os.path.isfile(COMPUTE_CFG):
-        config_file = COMPUTE_CFG
-
-    else:
-        raise Exception("Unrecognised node type - can't obtain config")
-
-    return config_file
-
 def main(hostname):
     config_file = get_config_file_for_node_type()
 
diff --git a/deployment_scripts/get_rr_peers.py b/deployment_scripts/get_rr_peers.py
new file mode 100755
index 0000000..9ee1ef7
--- /dev/null
+++ b/deployment_scripts/get_rr_peers.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# Copyright 2015 Metaswitch Networks
+
+import yaml
+from pluginutils import get_config_file_for_node_type
+
+def main():
+    config_file = get_config_file_for_node_type()
+
+    with open(config_file, "r") as f:
+        config = yaml.safe_load(f)
+
+    # The route reflector should only peer with compute nodes.
+    peer_ips = [node["internal_address"] for node in config["nodes"] 
+                if node["role"] == "compute"]
+
+    return peer_ips
+
+if __name__ == "__main__":
+    peer_ips = main()
+    if peer_ips:
+        print " ".join(peer_ips)
+
diff --git a/deployment_scripts/pluginutils.py b/deployment_scripts/pluginutils.py
new file mode 100755
index 0000000..ae8c0db
--- /dev/null
+++ b/deployment_scripts/pluginutils.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# Copyright 2015 Metaswitch Networks
+
+import os
+
+PRIMARY_CONTROLLER_CFG = "/etc/primary-controller.yaml"
+CONTROLLER_CFG = "/etc/controller.yaml"
+COMPUTE_CFG = "/etc/compute.yaml"
+
+def get_config_file_for_node_type():
+    if os.path.isfile(PRIMARY_CONTROLLER_CFG):
+        config_file = PRIMARY_CONTROLLER_CFG
+
+    elif os.path.isfile(CONTROLLER_CFG):
+        config_file = CONTROLLER_CFG
+
+    elif os.path.isfile(COMPUTE_CFG):
+        config_file = COMPUTE_CFG
+
+    else:
+        raise Exception("Unrecognised node type - can't obtain config")
+
+    return config_file