Merge pull request #1 from liaoishere/master

Code Issues Proposed changes

Fix spelling mistake and change default value in messaging_rabbit

This commit is contained in:

Newptone

2016年01月22日 15:22:51 +08:00

parent 27e7f82841 2ae2cc233f

commit 2ba865f18a

2 changed files with 26 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/cache.pp

View File

@@ -25,11 +25,11 @@

#

#oraddfollowingcodeinglance::api:

#

#create_resources(oslo::cache,$authtoken_config)

#create_resources(oslo::cache,$cache_config)

#

#Theninhierashouldaddthis:

#

#oslo::cache::cache_config:

#glance::api::cache_config:

#'glance_api_config':

#memcached_servers:'127.0.0.1'

#memcache_dead_retry:'100'

48
manifests/messaging_rabbit.pp

View File

@@ -116,30 +116,30 @@

#[*fake_rabbit*]

defineoslo::messaging_rabbit(

$kombu_ssl_version=undef,

$kombu_ssl_keyfile=undef,

$kombu_ssl_certfile=undef,

$kombu_ssl_ca_certs=undef,

$kombu_reconnect_delay='1',

$kombu_missing_consumer_retry_timeout='60',

$kombu_failover_strategy='round-robin',

$rabbit_host='localhost',

$rabbit_port='5672',

$rabbit_hosts='localhost:5672',

$rabbit_use_ssl=false,

$rabbit_userid='guest',

$rabbit_password=undef,

$rabbit_login_method='AMQPLAIN',

$rabbit_virtual_host='/',

$rabbit_retry_interval='1',

$rabbit_retry_backoff='2',

$rabbit_interval_max='30',

$rabbit_max_retries='0',

$rabbit_ha_queues=false,

$rabbit_transient_queues_ttl='600',

$heartbeat_timeout_threshold='60',

$heartbeat_rate='2',

$fake_rabbit=undef,

$kombu_ssl_version=$::os_service_default,

$kombu_ssl_keyfile=$::os_service_default,

$kombu_ssl_certfile=$::os_service_default,

$kombu_ssl_ca_certs=$::os_service_default,

$kombu_reconnect_delay=$::os_service_default,

$kombu_missing_consumer_retry_timeout=$::os_service_default,

$kombu_failover_strategy=$::os_service_default,

$rabbit_host=$::os_service_default,

$rabbit_port=$::os_service_default,

$rabbit_hosts=$::os_service_default,

$rabbit_use_ssl=$::os_service_default,

$rabbit_userid=$::os_service_default,

$rabbit_password=$::os_service_default,

$rabbit_login_method=$::os_service_default,

$rabbit_virtual_host=$::os_service_default,

$rabbit_retry_interval=$::os_service_default,

$rabbit_retry_backoff=$::os_service_default,

$rabbit_interval_max=$::os_service_default,

$rabbit_max_retries=$::os_service_default,

$rabbit_ha_queues=$::os_service_default,

$rabbit_transient_queues_ttl=$::os_service_default,

$heartbeat_timeout_threshold=$::os_service_default,

$heartbeat_rate=$::os_service_default,

$fake_rabbit=$::os_service_default,

){

create_resources($name, {'oslo_messaging_rabbit/kombu_ssl_version' => { value => $kombu_ssl_version }})

create_resources($name,{'oslo_messaging_rabbit/kombu_ssl_keyfile' => { value => $kombu_ssl_keyfile }})