From 5a70874e0945d9338b2c4e77daa9c675af49653e Mon Sep 17 00:00:00 2001
From: Erik Colnick <erik.colnick@hp.com>
Date: Fri, 10 Oct 2014 05:43:24 -0600
Subject: [PATCH] Remove redundancies between neutron-router and
 neutron-network-node

This change removes the redundancies created by the introduction of the
neutron-router as part of enabling Neutron DVR support in tripleo. Now
rather than installing the l3-agent and metadata-agent as part of the
neutron-network-node element, the element instead has a dependency on
the neutron-router element which does the desired agent installations.

Change-Id: Ief61d028fa3b0674b44d8fb94f585209fd7dc635
blueprint: support-neutron-dvr
---
 elements/neutron-network-node/element-deps        |  3 +--
 .../install.d/neutron-source-install/80-arping    |  4 ----
 .../neutron-source-install/80-neutron-networking  | 15 ---------------
 .../post-configure.d/80-neutron-networking        |  3 ---
 elements/neutron-network-node/pkg-map             | 10 ----------
 5 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100755 elements/neutron-network-node/install.d/neutron-source-install/80-arping
 delete mode 100755 elements/neutron-network-node/install.d/neutron-source-install/80-neutron-networking
 delete mode 100644 elements/neutron-network-node/pkg-map

diff --git a/elements/neutron-network-node/element-deps b/elements/neutron-network-node/element-deps
index e31f7a6b7..4304ed564 100644
--- a/elements/neutron-network-node/element-deps
+++ b/elements/neutron-network-node/element-deps
@@ -1,6 +1,5 @@
 neutron
 neutron-dhcp-agent
-neutron-openvswitch-agent
+neutron-router
 os-refresh-config
 pacemaker
-pkg-map
diff --git a/elements/neutron-network-node/install.d/neutron-source-install/80-arping b/elements/neutron-network-node/install.d/neutron-source-install/80-arping
deleted file mode 100755
index 3730836f0..000000000
--- a/elements/neutron-network-node/install.d/neutron-source-install/80-arping
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-set -eux
-
-install-packages -m neutron-network-node arping_package
diff --git a/elements/neutron-network-node/install.d/neutron-source-install/80-neutron-networking b/elements/neutron-network-node/install.d/neutron-source-install/80-neutron-networking
deleted file mode 100755
index b136bf580..000000000
--- a/elements/neutron-network-node/install.d/neutron-source-install/80-neutron-networking
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -eux
-
-# If NEUTRON_VENV_DIR is set, then need to fix up the l3.filters rootwrap file to allow l3-agent to
-# kill metadata-proxy processes when routers are deleted.
-if [ -n "${NEUTRON_VENV_DIR}" ]
-then
-    sed -i "s, /usr/bin/python, ${NEUTRON_VENV_DIR}/bin/python," /etc/neutron/rootwrap.d/l3.filters
-fi
-
-os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-l3-agent -u neutron -c neutron-l3-agent -- --config-file /etc/neutron/l3_agent.ini --config-dir /etc/neutron
-os-svc-daemon -i "$NEUTRON_VENV_DIR" -n neutron-metadata-agent -u neutron -c neutron-metadata-agent -- --config-file /etc/neutron/metadata_agent.ini --config-dir /etc/neutron
-
-# This has to be on the path of the agent that runs it http://pad.lv/1182704
-ln -sf $NEUTRON_VENV_DIR/bin/neutron-ns-metadata-proxy /usr/bin
diff --git a/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking b/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
index ce6a6b1a1..60f111cd3 100755
--- a/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
+++ b/elements/neutron-network-node/os-refresh-config/post-configure.d/80-neutron-networking
@@ -1,9 +1,6 @@
 #!/bin/bash
 set -eux
 
-os-svc-enable -n neutron-metadata-agent
-os-svc-enable -n neutron-l3-agent
-
 # this ensures that neutron-l3-agent and neutron-metadata-agent services
 # will be monitored by pacemaker on all nodes.
 # Because allow_automatic_l3agent_failover is enabled, we want
diff --git a/elements/neutron-network-node/pkg-map b/elements/neutron-network-node/pkg-map
deleted file mode 100644
index 478c80bf6..000000000
--- a/elements/neutron-network-node/pkg-map
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "family": {
-    "debian": {
-      "arping_package": "iputils-arping"
-    }
-  },
-  "default": {
-    "arping_package": "iputils"
-  }
-}