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, 24 deletions

diff --git a/build/puppet-cinder-quota-fix.patch b/build/puppet-cinder-quota-fix.patch
deleted file mode 100644
index 2369a517..00000000
--- a/build/puppet-cinder-quota-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b005b350768987d9423ab22b09f52e79b2eda5d9 Mon Sep 17 00:00:00 2001
-From: Tim Rozet <tdrozet@gmail.com>
-Date: Wed, 20 Jan 2016 13:57:01 -0500
-Subject: [PATCH] Fixes quota problem with cinder
-
----
- manifests/api.pp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/manifests/api.pp b/manifests/api.pp
-index 6ffd8a6..9fcb59e 100644
---- a/manifests/api.pp
-+++ b/manifests/api.pp
-@@ -282,6 +282,7 @@ class cinder::api (
-   if $keystone_enabled {
-     cinder_config {
-       'DEFAULT/auth_strategy':     value => 'keystone' ;
-+      'keystone_authtoken/auth_uri': value => $auth_uri_real;
-     }
- 
-     cinder_api_paste_ini {
--- 
-2.5.0
-