Merge "Remove api-ec2 references"

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]",

roles/os-compute-api-ec2.json

@@ -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": {
-  }
-}

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]"