From 75f5f89044c166c67d38924e50928ee91019988b Mon Sep 17 00:00:00 2001
From: Samuel Cassiba <sam@cassiba.com>
Date: Thu, 17 Mar 2016 16:09:24 -0700
Subject: [PATCH] Remove api-ec2 references

api-ec2 is being replaced by the `openstack-ec2` cookbook.

Change-Id: I2dbbafaf8641ece00d4181d1ea4ba93f00eed6ed
---
 roles/allinone.json           |  1 -
 roles/os-compute-api-ec2.json | 16 ----------------
 roles/os-compute-api.json     |  1 -
 3 files changed, 18 deletions(-)
 delete mode 100644 roles/os-compute-api-ec2.json

diff --git a/roles/allinone.json b/roles/allinone.json
index f6f0dde..8ba051f 100644
--- a/roles/allinone.json
+++ b/roles/allinone.json
@@ -38,7 +38,6 @@
     "recipe[openstack-compute::identity_registration]",
     "recipe[openstack-compute::conductor]",
     "recipe[openstack-compute::scheduler]",
-    "recipe[openstack-compute::api-ec2]",
     "recipe[openstack-compute::api-os-compute]",
     "recipe[openstack-compute::api-metadata]",
     "recipe[openstack-compute::nova-cert]",
diff --git a/roles/os-compute-api-ec2.json b/roles/os-compute-api-ec2.json
deleted file mode 100644
index 27742e6..0000000
--- a/roles/os-compute-api-ec2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "os-compute-api-ec2",
-  "description": "EC2 API for Compute",
-  "json_class": "Chef::Role",
-  "default_attributes": {
-  },
-  "override_attributes": {
-  },
-  "chef_type": "role",
-  "run_list": [
-    "role[os-base]",
-    "recipe[openstack-compute::api-ec2]"
-  ],
-  "env_run_lists": {
-  }
-}
diff --git a/roles/os-compute-api.json b/roles/os-compute-api.json
index 117dc35..d261566 100644
--- a/roles/os-compute-api.json
+++ b/roles/os-compute-api.json
@@ -9,7 +9,6 @@
   "chef_type": "role",
   "run_list": [
     "role[os-base]",
-    "role[os-compute-api-ec2]",
     "role[os-compute-api-os-compute]",
     "role[os-compute-api-metadata]",
     "recipe[openstack-compute::identity_registration]"