3 files changed, 41 insertions, 1 deletions
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 1692108..5154464 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -191,6 +191,9 @@ class tripleo::profile::base::database::mysql (
     if hiera('panko_api_enabled', false) {
       include ::panko::db::mysql
     }
+    if hiera('ec2_api_enabled', false) {
+      include ::ec2api::db::mysql
+    }
   }
 
 }
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index a388def..a3a39e9 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -255,6 +255,8 @@ class tripleo::profile::base::keystone (
       include ::zaqar::keystone::auth
       include ::zaqar::keystone::auth_websocket
     }
+    if hiera('ec2_api_enabled', false) {
+      include ::ec2api::keystone::auth
+    }
   }
 }
-
diff --git a/manifests/profile/base/nova/ec2api.pp b/manifests/profile/base/nova/ec2api.pp
new file mode 100644
index 0000000..f34b071
--- /dev/null
+++ b/manifests/profile/base/nova/ec2api.pp
@@ -0,0 +1,35 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::nova::ec2api
+#
+# EC2-compatible Nova API profile for tripleo
+#
+# === Parameters
+#
+# [*step*]
+#   (Optional) The current step in deployment. See tripleo-heat-templates
+#   for more details.
+#   Defaults to hiera('step')
+#
+class tripleo::profile::base::nova::ec2api (
+  $step    = hiera('step')
+) {
+  if $step >= 4 {
+    include ::ec2api
+    include ::ec2api::api
+    include ::ec2api::db::sync
+    include ::ec2api::metadata
+  }
+}