From 353c4f1240d974e9ce93ba1f00a4bc7fe2c5856e Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Mon, 10 Mar 2014 08:44:18 -0400
Subject: [PATCH] remove additional f18 references

f18 has been EOL for 6 weeks now, time to purge it from devstack

Change-Id: I5aac2c63b2f4cd8b01ae685b1acf4c188637558b
---
 files/rpms/cinder   | 2 +-
 files/rpms/glance   | 4 ++--
 files/rpms/horizon  | 4 ++--
 files/rpms/keystone | 8 ++++----
 files/rpms/neutron  | 4 ++--
 files/rpms/nova     | 6 +++---
 files/rpms/swift    | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/files/rpms/cinder b/files/rpms/cinder
index 199ae10b79..423d57cd98 100644
--- a/files/rpms/cinder
+++ b/files/rpms/cinder
@@ -4,4 +4,4 @@ qemu-img
 python-devel
 postgresql-devel
 iscsi-initiator-utils
-python-lxml         #dist:f18,f19,f20,rhel7
+python-lxml         #dist:f19,f20,rhel7
diff --git a/files/rpms/glance b/files/rpms/glance
index 25c5d3902b..c886ecee10 100644
--- a/files/rpms/glance
+++ b/files/rpms/glance
@@ -9,8 +9,8 @@ python-argparse
 python-devel
 python-eventlet
 python-greenlet
-python-lxml         #dist:f18,f19,f20,rhel7
-python-paste-deploy #dist:f18,f19,f20,rhel7
+python-lxml         #dist:f19,f20,rhel7
+python-paste-deploy #dist:f19,f20,rhel7
 python-routes
 python-sqlalchemy
 python-wsgiref
diff --git a/files/rpms/horizon b/files/rpms/horizon
index 59503cc9aa..2dd24e0763 100644
--- a/files/rpms/horizon
+++ b/files/rpms/horizon
@@ -16,8 +16,8 @@ python-kombu
 python-migrate
 python-mox
 python-nose
-python-paste        #dist:f18,f19,f20
-python-paste-deploy #dist:f18,f19,f20
+python-paste        #dist:f19,f20
+python-paste-deploy #dist:f19,f20
 python-routes
 python-sphinx
 python-sqlalchemy
diff --git a/files/rpms/keystone b/files/rpms/keystone
index 99e8524628..7182091b31 100644
--- a/files/rpms/keystone
+++ b/files/rpms/keystone
@@ -1,9 +1,9 @@
 python-greenlet
 libxslt-devel       # dist:f20
-python-lxml         #dist:f18,f19,f20
-python-paste        #dist:f18,f19,f20
-python-paste-deploy #dist:f18,f19,f20
-python-paste-script #dist:f18,f19,f20
+python-lxml         #dist:f19,f20
+python-paste        #dist:f19,f20
+python-paste-deploy #dist:f19,f20
+python-paste-script #dist:f19,f20
 python-routes
 python-sqlalchemy
 python-webob
diff --git a/files/rpms/neutron b/files/rpms/neutron
index 42d7f68d37..06ea0ea35d 100644
--- a/files/rpms/neutron
+++ b/files/rpms/neutron
@@ -11,8 +11,8 @@ python-greenlet
 python-iso8601
 python-kombu
 #rhel6 gets via pip
-python-paste        # dist:f18,f19,f20,rhel7
-python-paste-deploy # dist:f18,f19,f20,rhel7
+python-paste        # dist:f19,f20,rhel7
+python-paste-deploy # dist:f19,f20,rhel7
 python-qpid
 python-routes
 python-sqlalchemy
diff --git a/files/rpms/nova b/files/rpms/nova
index a607d925e1..45d6e0bfb1 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -28,11 +28,11 @@ python-kombu
 python-lockfile
 python-migrate
 python-mox
-python-paramiko # dist:f18,f19,f20,rhel7
+python-paramiko # dist:f19,f20,rhel7
 # ^ on RHEL6, brings in python-crypto which conflicts with version from
 # pip we need
-python-paste        # dist:f18,f19,f20,rhel7
-python-paste-deploy # dist:f18,f19,f20,rhel7
+python-paste        # dist:f19,f20,rhel7
+python-paste-deploy # dist:f19,f20,rhel7
 python-qpid
 python-routes
 python-sqlalchemy
diff --git a/files/rpms/swift b/files/rpms/swift
index 72253f7752..bf29ea29b7 100644
--- a/files/rpms/swift
+++ b/files/rpms/swift
@@ -9,7 +9,7 @@ python-eventlet
 python-greenlet
 python-netifaces
 python-nose
-python-paste-deploy # dist:f18,f19,f20,rhel7
+python-paste-deploy # dist:f19,f20,rhel7
 python-simplejson
 python-webob
 pyxattr