openstack/fuel-library
Code Issues Proposed changes

Fix compilation of modules

Browse Source
This commit is contained in:
vic
2012-11-06 19:31:39 +04:00
parent 71d5957706
commit 2b7c12fc4a
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
deployment/puppet/openstack/manifests/compute.pp
View File

@@ -51,14 +51,14 @@ class openstack::compute (
$internal_address,
# Required Nova
$nova_user_password,
# Required Rabbit
$rabbit_password,
# Network
# DB
$sql_connection = false,
# Nova
$purge_nova_config = false,
# Rabbit
$rabbit_nodes = false,
$rabbit_password = 'rabbit_pw',
$rabbit_host = false,
$rabbit_user = 'nova',
# Glance
@@ -69,7 +69,6 @@ class openstack::compute (
$vnc_enabled = true,
$vncproxy_host = undef,
# General
$verbose = 'False',
$enabled = true,
$multi_host = false,
$public_interface,
@@ -78,14 +77,7 @@ class openstack::compute (
$fixed_range,
$quantum = false,
$cinder = false,
$rabbit_nodes = false,
$rabbit_password = 'rabbit_pw',
$rabbit_user = 'nova',
$glance_api_servers = false,
# nova compute configuration parameters
$libvirt_type = 'kvm',
$vncproxy_host = false,
$vnc_enabled = 'true',
$verbose = false,
$manage_volumes = false,
$cache_server_ip = ['127.0.0.1'],

4
deployment/puppet/openstack/manifests/controller.pp
View File

@@ -85,6 +85,7 @@ class openstack::controller (
# not sure if this works correctly
$internal_address = $public_address,
$admin_address = $public_address,
# Rabbit
$rabbit_password = 'rabbit_pw',
$rabbit_user = 'nova',
$rabbit_cluster = false,
@@ -117,9 +118,6 @@ class openstack::controller (
$nova_db_user = 'nova',
$nova_db_dbname = 'nova',
$purge_nova_config = false,
# Rabbit
$rabbit_password = 'rabbit_pw',
$rabbit_user = 'nova',
# Horizon
$cache_server_ip = ['127.0.0.1'],
$cache_server_port = '11211',