aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlavio Percoco <flaper87@gmail.com>2016-12-07 15:38:28 +0100
committerEmilien Macchi <emilien@redhat.com>2017-01-04 09:41:51 -0500
commitb09f7a6c80de65c53c8af3a3a84024a19fa320fe (patch)
treef3a01b2175132e0b0f0c47fab0f5817f5e2487f5
parent71af301fc5c60c1cccb66dbfc630713c947a94d3 (diff)
Sync the db as part of the glance-api install
The glance database should be created as part of the glance-api service installation and not the registry. Move the db_sync param to the glance-api class call. Change-Id: Ib9f511219e8cb9a7322745b6bd7c4f9c9cc0c198
-rw-r--r--manifests/profile/base/glance/api.pp23
-rw-r--r--manifests/profile/base/glance/registry.pp14
2 files changed, 25 insertions, 12 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])
}