3 files changed, 26 insertions, 13 deletions
diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 5ba7a0b..bfa9572 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -18,6 +18,10 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*glance_backend*]
 #   (Optional) Glance backend(s) to use.
 #   Defaults to downcase(hiera('glance_backend', 'swift'))
@@ -40,6 +44,7 @@
 #   Defaults to hiera('glance::notify::rabbitmq::rabbit_port', 5672)
 
 class tripleo::profile::base::glance::api (
+  $bootstrap_node     = hiera('bootstrap_nodeid', undef),
   $glance_backend     = downcase(hiera('glance_backend', 'swift')),
   $glance_nfs_enabled = false,
   $step               = hiera('step'),
@@ -47,11 +52,17 @@ class tripleo::profile::base::glance::api (
   $rabbit_port        = hiera('glance::notify::rabbitmq::rabbit_port', 5672),
 ) {
 
+  if $::hostname == downcase($bootstrap_node) {
+    $sync_db = true
+  } else {
+    $sync_db = false
+  }
+
   if $step >= 1 and $glance_nfs_enabled {
     include ::tripleo::glance::nfs_mount
   }
 
-  if $step >= 4 {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     case $glance_backend {
         'swift': { $backend_store = 'glance.store.swift.Store' }
         'file': { $backend_store = 'glance.store.filesystem.Store' }
@@ -65,7 +76,15 @@ class tripleo::profile::base::glance::api (
     include ::glance
     include ::glance::config
     class { '::glance::api':
-      stores => $glance_store,
+      stores  => $glance_store,
+      sync_db => false,
+    }
+    # When https://review.openstack.org/#/c/408554 is merged,
+    # Remove this block and set sync_db to $sync_db in glance::api.
+    if $sync_db {
+      class { '::glance::db::sync':
+        extra_params => '',
+      }
     }
     $rabbit_endpoints = suffix(any2array($rabbit_hosts), ":${rabbit_port}")
     class { '::glance::notify::rabbitmq' :
diff --git a/manifests/profile/base/glance/registry.pp b/manifests/profile/base/glance/registry.pp
index 9e2be9d..cd40aeb 100644
--- a/manifests/profile/base/glance/registry.pp
+++ b/manifests/profile/base/glance/registry.pp
@@ -19,6 +19,7 @@
 # === Parameters
 #
 # [*bootstrap_node*]
+#   DEPRECATED
 #   (Optional) The hostname of the node responsible for bootstrapping tasks
 #   Defaults to hiera('bootstrap_nodeid')
 #
@@ -32,23 +33,16 @@
 #   Defaults to hiera('step')
 #
 class tripleo::profile::base::glance::registry (
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $bootstrap_node = undef,
   $glance_backend = downcase(hiera('glance_backend', 'swift')),
   $step           = hiera('step'),
 ) {
-  if $::hostname == downcase($bootstrap_node) {
-    $sync_db = true
-  } else {
-    $sync_db = false
-  }
 
-  if $step >= 4 or ( $step >= 3 and $sync_db ) {
+  if $step >= 4 {
     # TODO: notifications, scrubber, etc.
     include ::glance
     include ::glance::config
-    class { '::glance::registry' :
-      sync_db        => $sync_db,
-    }
+    include ::glance::registry
     include ::glance::notify::rabbitmq
     include join(['::glance::backend::', $glance_backend])
   }
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index e660990..69b90fa 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -101,7 +101,7 @@ class tripleo::profile::base::nova::api (
       sync_db     => $sync_db,
       sync_db_api => $sync_db,
     }
-    class { '::nova::wsgi::apache':
+    class { '::nova::wsgi::apache_api':
       ssl_cert => $tls_certfile,
       ssl_key  => $tls_keyfile,
     }