diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-09 14:31:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-09 14:31:40 +0000 |
| commit | 91c5c470890f1716e70ca50a72ff7431e6fac08a (patch) | |
| tree | cc9f38409309a3603d03c54331833291837ee8ab /puppet/controller.yaml | |
| parent | 84f7ec83b82d719609b09117d306706cebef33e9 (diff) | |
| parent | 6091f0b957287fb47f70eeb527c47fe80c307a31 (diff) | |
Merge "Add Rabbit IPv6 only support"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 370d6e63..186dce64 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -617,6 +617,10 @@ parameters: default: 16384 description: Configures RabbitMQ FD limit type: string + RabbitIPv6: + default: false + description: Enable IPv6 in RabbitMQ + type: boolean RedisVirtualIP: type: string default: '' # Has to be here because of the ignored empty value bug @@ -1185,6 +1189,7 @@ resources: rabbit_cookie: {get_param: RabbitCookie} rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} rabbit_client_port: {get_param: RabbitClientPort} + rabbit_ipv6: {get_param: RabbitIPv6} mongodb_no_journal: {get_param: MongoDbNoJournal} mongodb_ipv6: {get_param: MongoDbIPv6} # We need to force this into quotes or hiera will return integer causing @@ -1603,6 +1608,7 @@ resources: rabbitmq::file_limit: {get_input: rabbit_fd_limit} rabbitmq::default_user: {get_input: rabbit_username} rabbitmq::default_pass: {get_input: rabbit_password} + rabbit_ipv6: {get_input: rabbit_ipv6} # Redis redis::bind: {get_input: redis_network} redis_vip: {get_input: redis_vip} |