From 7c4ca93b1906c74fd0e2d716a7ea1caa86efc23f Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Thu, 3 Jul 2014 18:16:29 +0200 Subject: [PATCH] trove: implement API, Conductor and Taskmanager Implement all the class we need on controller nodes. Signed-off-by: Emilien Macchi --- manifests/database/dbaas.pp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/manifests/database/dbaas.pp b/manifests/database/dbaas.pp index 334df315..c12e8094 100644 --- a/manifests/database/dbaas.pp +++ b/manifests/database/dbaas.pp @@ -58,9 +58,9 @@ class cloud::database::dbaas( $trove_db_password = 'trovepassword', $rabbit_hosts = ['127.0.0.1:5672'], $rabbit_password = 'rabbitpassword', - $nova_proxy_admin_pass = 'novapassword', - $nova_proxy_admin_user = 'admin', - $nova_proxy_admin_tenant_name = 'admin', + $nova_admin_username = 'trove', + $nova_admin_tenant_name = 'services', + $nova_admin_password = 'trovepassword', ) { $encoded_user = uriescape($trove_db_user) @@ -70,9 +70,10 @@ class cloud::database::dbaas( database_connection => "mysql://${encoded_user}:${encoded_password}@${trove_db_host}/trove?charset=utf8", rabbit_hosts => $rabbit_hosts, rabbit_password => $rabbit_password, - nova_proxy_admin_pass => $nova_proxy_admin_pass, - nova_proxy_admin_user => $nova_proxy_admin_user, - nova_proxy_admin_tenant_name => $nova_proxy_admin_tenant_name + rabbit_userid => 'trove', + nova_proxy_admin_pass => $nova_admin_password, + nova_proxy_admin_user => $nova_admin_username, + nova_proxy_admin_tenant_name => $nova_admin_tenant_name } exec {'trove_db_sync':