diff options
author | Dan Radez <dradez@redhat.com> | 2016-03-08 16:19:04 -0500 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2016-04-01 19:12:25 -0400 |
commit | 9a96f371f290fdf8530239a4c0df591527fe636f (patch) | |
tree | 7450d1b1e6023adf1cc82de5b3523518ce421590 /build/aodh-os-cloud-config.patch | |
parent | 53003f9fef6b49304f37e5fbb5d15bc4f1316948 (diff) |
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>
Diffstat (limited to 'build/aodh-os-cloud-config.patch')
-rw-r--r-- | build/aodh-os-cloud-config.patch | 28 |
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 - |