From 47ee87f17c42b60d8bc100dd09c7b65abddb9994 Mon Sep 17 00:00:00 2001 From: Dan Bode Date: Thu, 12 Apr 2012 14:13:43 -0700 Subject: [PATCH] DB sync should also require db privs Currently, the db_sync exec was just dependent on the db existing, but it did not require the correct users with th correct privs were created. This commit fixes that. --- manifests/db.pp | 2 ++ manifests/registry.pp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/db.pp b/manifests/db.pp index c10e7ebf..2d42ff59 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -11,6 +11,8 @@ class glance::db( $cluster_id = 'localzone' ) { + Class['glance::db'] ~> Exec<| title == 'glance-manage db_sync' |> + require 'mysql::python' mysql::db { $dbname: diff --git a/manifests/registry.pp b/manifests/registry.pp index 86955e53..bee1a1b4 100644 --- a/manifests/registry.pp +++ b/manifests/registry.pp @@ -33,8 +33,6 @@ class glance::registry( content => template('glance/glance-registry-paste.ini.erb'), } - Database<| title == 'glance' |> ~> Exec['glance-manage db_sync'] - exec { 'glance-manage db_sync': path => '/usr/bin', refreshonly => true,