From 8c925198ae5aa7c57f712e75d2f0fb62f8f952d0 Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Thu, 1 Nov 2018 09:23:52 -0700
Subject: [PATCH] [LVM][IPv6] Quagga changes to support Bionic Beaver

Pre-create config and log directories and
update Quagga service configuration.

This patch does not add Bionic support to the gate
jobs. https://review.openstack.org/#/c/608761/ does
the job configuration changes to run with Bionic.

Needed-By: https://review.openstack.org/#/c/608761/
Change-Id: I146ab5a41c06df2b2615ebdb38aaeb972db4c1d2
---
 contrib/ci/post_test_hook.sh |  5 +++--
 devstack/plugin.sh           | 43 ++++++++++++++++++++++++++----------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh
index 378f38868a..b52cc8f2a1 100755
--- a/contrib/ci/post_test_hook.sh
+++ b/contrib/ci/post_test_hook.sh
@@ -358,11 +358,12 @@ source $BASE/new/devstack/openrc admin admin
 public_net_id=$(openstack network list --name $PUBLIC_NETWORK_NAME -f value -c ID )
 iniset $TEMPEST_CONFIG network public_network_id $public_net_id
 
-# Now that all plugins are loaded, setup BGP here
 if [ $(trueorfalse False MANILA_SETUP_IPV6) == True ]; then
+    # Now that all plugins are loaded, setup BGP here
+    public_gateway_ipv6=$(openstack subnet show ipv6-public-subnet -c gateway_ip -f value)
     neutron bgp-speaker-create --ip-version 6 --local-as 100 bgpspeaker
     neutron bgp-speaker-network-add bgpspeaker $PUBLIC_NETWORK_NAME
-    neutron bgp-peer-create --peer-ip ::1 --remote-as 200 bgppeer
+    neutron bgp-peer-create --peer-ip $public_gateway_ipv6 --remote-as 200 bgppeer
     neutron bgp-speaker-peer-add bgpspeaker bgppeer
 fi
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 86387a417c..f4e80be8e2 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -1022,16 +1022,22 @@ function setup_ipv6 {
     echo "log file /var/log/quagga/zebra.log"
     ) | sudo tee /etc/quagga/zebra.conf > /dev/null
 
+    # set Quagga vtysh.conf
+    (
+    echo "service integrated-vtysh-config"
+    echo "username quagga nopassword"
+    ) | sudo tee /etc/quagga/vtysh.conf > /dev/null
+
     # set Quagga bgpd.conf
     (
     echo "log file /var/log/quagga/bgpd.log"
     echo "bgp multiple-instance"
     echo "router bgp 200"
     echo " bgp router-id 1.2.3.4"
-    echo " neighbor ::1 remote-as 100"
-    echo " neighbor ::1 passive"
+    echo " neighbor $public_gateway_ipv6 remote-as 100"
+    echo " neighbor $public_gateway_ipv6 passive"
     echo " address-family ipv6"
-    echo "  neighbor ::1 activate"
+    echo "  neighbor $public_gateway_ipv6 activate"
     echo "line vty"
     echo "debug bgp events"
     echo "debug bgp filters"
@@ -1040,21 +1046,34 @@ function setup_ipv6 {
     echo "debug bgp updates"
     ) | sudo tee /etc/quagga/bgpd.conf > /dev/null
 
-    if is_ubuntu; then
-        sudo systemctl enable quagga
-        sudo systemctl restart quagga
-    else
+    # Quagga logging
+    sudo mkdir -p /var/log/quagga
+    sudo touch /var/log/quagga/zebra.log
+    sudo touch /var/log/quagga/bgpd.log
+    sudo chown -R quagga:quagga /var/log/quagga
+
+
+    GetOSVersion
+    QUAGGA_SERVICES="zebra bgpd"
+    if [[ is_ubuntu && "$os_CODENAME" == "xenial" ]]; then
+        # In Ubuntu Xenial, the services bgpd and zebra are under
+        # one systemd unit: quagga
+        QUAGGA_SERVICES="quagga"
+    elif is_fedora; then
         # Disable SELinux rule that conflicts with Zebra
         sudo setsebool -P zebra_write_config 1
-        sudo systemctl enable zebra
-        sudo systemctl enable bgpd
-        sudo systemctl restart zebra
-        sudo systemctl restart bgpd
     fi
+    sudo systemctl enable $QUAGGA_SERVICES
+    sudo systemctl restart $QUAGGA_SERVICES
+
+    # log the systemd status
+    sudo systemctl status $QUAGGA_SERVICES
 
     # add default IPv6 route back
     if ! [[ -z $default_route ]]; then
-        sudo ip -6 route add $default_route
+        # "replace" should ignore "RTNETLINK answers: File exists"
+        # error if the route wasn't flushed by the bgp setup we did earlier.
+        sudo ip -6 route replace $default_route
     fi
 
 }