openstack
/
fuel-library
Code Issues Proposed changes

Fix some missing url variables

This commit is contained in:
Dmitry Ilyin 2013-10-20 18:43:47 +04:00
parent 89b37f9211
commit f0caef1d95
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/murano/manifests/conductor.pp
View File

@ -7,7 +7,7 @@ class murano::conductor (
$verbose = 'True',
$data_dir = '/etc/murano',
$max_environments = '20',
$heat_auth_url = 'http://127.0.0.1:5000/v2.0',
$auth_url = 'http://127.0.0.1:5000/v2.0',
$rabbit_host = '127.0.0.1',
$rabbit_port = '5672',
$rabbit_ssl = 'False',
@ -39,7 +39,7 @@ class murano::conductor (
'DEFAULT/verbose' : value => $verbose;
'DEFAULT/data_dir' : value => $data_dir;
'DEFAULT/max_environments' : value => $max_environments;
'heat/auth_url' : value => $heat_auth_url;
'keystone/auth_url' : value => $auth_url;
'rabbitmq/host' : value => $rabbit_host;
'rabbitmq/port' : value => $rabbit_port;
'rabbitmq/ssl' : value => $rabbit_ssl;

4
deployment/puppet/murano/manifests/init.pp
View File

@ -12,6 +12,7 @@ class murano (
$murano_verbose = 'True',
$murano_data_dir = '/etc/murano',
$murano_max_environments = '20',
$murano_api_host = '127.0.0.1',
# rabbit
$murano_rabbit_host = '127.0.0.1',
$murano_rabbit_port = '55572',
@ -59,7 +60,7 @@ class murano (
log_file => $murano_log_file,
data_dir => $murano_data_dir,
max_environments => $murano_max_environments,
heat_auth_url => $murano_keystone_auth_url,
auth_url => $murano_keystone_auth_url,
rabbit_host => $murano_rabbit_host,
rabbit_port => $murano_rabbit_port,
@ -110,6 +111,7 @@ class murano (
class { 'murano::dashboard' :
settings_py => '/usr/share/openstack-dashboard/openstack_dashboard/settings.py',
collect_static_script => '/usr/share/openstack-dashboard/manage.py',
murano_url_string => "MURANO_API_URL = 'http://${murano_api_host}:${murano_api_bind_port}'",
}
class { 'murano::rabbitmq' :

3
deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -366,7 +366,6 @@ class osnailyfacter::cluster_ha {
if $savanna_hash['enabled'] {
class { 'savanna' :
savanna_enabled => true,
savanna_api_host => $controller_node_address,
savanna_db_password => $savanna_hash['db_password'],
@ -384,6 +383,8 @@ class osnailyfacter::cluster_ha {
if $murano_hash['enabled'] {
class { 'murano' :
murano_api_host => $controller_node_address,
murano_rabbit_host => $controller_node_public,
murano_rabbit_login => 'murano',
murano_rabbit_password => $heat_hash['rabbit_password'],

3
deployment/puppet/osnailyfacter/manifests/cluster_simple.pp
View File

@ -247,7 +247,6 @@ class osnailyfacter::cluster_simple {
if $savanna_hash['enabled'] {
class { 'savanna' :
savanna_enabled => true,
savanna_api_host => $controller_node_address,
savanna_db_password => $savanna_hash['db_password'],
@ -265,6 +264,8 @@ class osnailyfacter::cluster_simple {
if $murano_hash['enabled'] {
class { 'murano' :
murano_api_host => $controller_node_address,
murano_rabbit_host => $controller_node_public,
murano_rabbit_login => 'murano',
murano_rabbit_password => $heat_hash['rabbit_password'],