5 files changed, 16 insertions, 6 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 72049e3..3ff8e63 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -168,11 +168,11 @@ class tripleo::profile::base::keystone (
 
   }
 
-  if $step >= 5 and $manage_db_purge {
+  if $step >= 4 and $manage_db_purge {
     include ::keystone::cron::token_flush
   }
 
-  if $step >= 5 and $manage_domain {
+  if $step >= 3 and $manage_domain {
     if hiera('heat_engine_enabled', false) {
       # create these seperate and don't use ::heat::keystone::domain since
       # that class writes out the configs
@@ -193,7 +193,7 @@ class tripleo::profile::base::keystone (
     }
   }
 
-  if $step >= 5 and $manage_endpoint{
+  if $step >= 3 and $manage_endpoint{
     if hiera('aodh_api_enabled', false) {
       include ::aodh::keystone::auth
     }
diff --git a/manifests/profile/base/neutron/ovs.pp b/manifests/profile/base/neutron/ovs.pp
index a4e0cd3..bec7e96 100644
--- a/manifests/profile/base/neutron/ovs.pp
+++ b/manifests/profile/base/neutron/ovs.pp
@@ -28,7 +28,7 @@ class tripleo::profile::base::neutron::ovs(
 ) {
   include ::tripleo::profile::base::neutron
 
-  if $step >= 4 {
+  if $step >= 5 {
     include ::neutron::agents::ml2::ovs
 
     # Optional since manage_service may be false and neutron server may not be colocated.
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 99911d2..27b47b2 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -90,7 +90,9 @@ class tripleo::profile::base::nova::api (
       sync_db     => $sync_db,
       sync_db_api => $sync_db,
     }
-    if hiera('nova_wsgi_enabled', true) {
+    # Temporarily disable Nova API deployed in WSGI
+    # https://bugs.launchpad.net/nova/+bug/1661360
+    if hiera('nova_wsgi_enabled', false) {
       if $enable_internal_tls {
         if $generate_service_certificates {
           ensure_resources('tripleo::certmonger::httpd', $certificates_specs)
@@ -117,6 +119,13 @@ class tripleo::profile::base::nova::api (
     if hiera('nova_enable_db_purge', true) {
       include ::nova::cron::archive_deleted_rows
     }
+    # At step 5, we consider all nova-compute services started and registred to nova-conductor
+    # So we want to update Nova Cells database to be aware of these hosts by executing the
+    # nova-cell_v2-discover_hosts command again.
+    # Doing it on a single nova-api node to avoid race condition.
+    if $sync_db {
+      Exec<| title == 'nova-cell_v2-discover_hosts' |> { refreshonly => false }
+    }
   }
 }
 
diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp
index 076996a..0eb2ed7 100644
--- a/manifests/profile/base/nova/compute.pp
+++ b/manifests/profile/base/nova/compute.pp
@@ -42,6 +42,7 @@ class tripleo::profile::base::nova::compute (
     # before nova-compute.
     Service<| title == 'nova-conductor' |> -> Service['nova-compute']
 
+
     # deploy bits to connect nova compute to neutron
     include ::nova::network::neutron
 
diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp
index aa8c3c7..c429373 100644
--- a/manifests/profile/base/nova/placement.pp
+++ b/manifests/profile/base/nova/placement.pp
@@ -85,7 +85,7 @@ class tripleo::profile::base::nova::placement (
     $tls_keyfile = undef
   }
 
-  if $step >= 4 {
+  if $step >= 3 {
     class { '::nova::wsgi::apache_placement':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,