3 files changed, 37 insertions, 21 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 8ded3ef..83baae2 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -85,25 +85,8 @@ class tripleo::profile::base::nova::api (
     $tls_keyfile = undef
   }
 
-  if ($step >= 3 and $sync_db) {
-    $messaging_hosts_real = any2array($::tripleo::profile::base::nova::messaging_hosts)
-    # TODO(aschultz): remove sprintf once we properly type the port, needs
-    # to be a string for the os_transport_url function.
-    $messaging_port_real = sprintf('%s', $::tripleo::profile::base::nova::messaging_port)
-    $messaging_use_ssl_real = sprintf('%s', bool2num(str2bool($::tripleo::profile::base::nova::messaging_use_ssl)))
-
-    #TODO(emilien): enable it again when it's fixed upstream in nova
-    # https://bugs.launchpad.net/tripleo/+bug/1649341
-    # class { '::nova::db::sync_cell_v2':
-    #   transport_url => os_transport_url({
-    #     'transport' => $::tripleo::profile::base::nova::messaging_driver,
-    #     'hosts'     => $messaging_hosts_real,
-    #     'port'      => $messaging_port_real,
-    #     'username'  => $::tripleo::profile::base::nova::messaging_username,
-    #     'password'  => $::tripleo::profile::base::nova::messaging_password,
-    #     'ssl'       => $messaging_use_ssl_real,
-    #     }),
-    # }
+  if $step >= 3 and $sync_db {
+    include ::nova::cell_v2::simple_setup
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
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
+  }
+}
diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp
index 7edd4e8..aa8c3c7 100644
--- a/manifests/profile/base/nova/placement.pp
+++ b/manifests/profile/base/nova/placement.pp
@@ -86,8 +86,6 @@ class tripleo::profile::base::nova::placement (
   }
 
   if $step >= 4 {
-    include ::nova::placement
-
     class { '::nova::wsgi::apache_placement':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,