Migrating to Mitaka

- Only support for NOSDN for this patch
- Other SDN controllers will not be tested for this patch
- AODH is now upstream and not needed to be carried in Apex
- puppet-cinder-quota-fix.patch is now upstream and not needed to be carried in Apex
- puppet-neutron-force-metadata.patch is now upstream and not needed to be carried in Apex
- removing the catalog of nic files and creating a templatization for them

JIRA: APEX-108
JIRA: APEX-93
JIRA: APEX-92

Change-Id: Ic1a24baec7ef295e9dc1b8b72ac36ca5b05578ea
Signed-off-by: Dan Radez <dradez@redhat.com>

1 files changed, 0 insertions, 28 deletions

diff --git a/build/aodh-os-cloud-config.patch b/build/aodh-os-cloud-config.patch
deleted file mode 100644
index e2995401..00000000
--- a/build/aodh-os-cloud-config.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6809aa30bdd447dc839fe66af59b88836a2dd2ef Mon Sep 17 00:00:00 2001
-From: Tim Rozet <trozet@redhat.com>
-Date: Mon, 25 Jan 2016 21:48:22 +0000
-Subject: [PATCH] Adds aodh
-
----
- keystone.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/keystone.py b/keystone.py
-index 90ea00a..b74f223 100644
---- a/keystone.py
-+++ b/keystone.py
-@@ -75,6 +75,11 @@ SERVICES = {
-         'type': 'metering',
-         'port': 8777,
-     },
-+    'aodh': {
-+        'description': 'Aodh Service',
-+        'type': 'alarming',
-+        'port': 8042,
-+    },
-     'cinder': {
-         'description': 'Cinder Volume Service',
-         'type': 'volume',
--- 
-1.8.3.1
-