Merge "Remove default for the RabbitMQ password"
authorJenkins <jenkins@review.openstack.org>
Fri, 18 Mar 2016 09:37:30 +0000 (09:37 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 18 Mar 2016 09:37:30 +0000 (09:37 +0000)
1  2 
puppet/controller.yaml

diff --combined puppet/controller.yaml
@@@ -595,7 -595,6 +595,6 @@@ parameters
      default: ''  # Has to be here because of the ignored empty value bug
      hidden: true
    RabbitPassword:
-     default: guest
      description: The password for RabbitMQ
      type: string
      hidden: true
@@@ -1195,9 -1194,16 +1194,9 @@@ resources
          rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
          rabbit_client_port: {get_param: RabbitClientPort}
          rabbit_ipv6: {get_param: RabbitIPv6}
 +        rabbit_fd_limit: {get_param: RabbitFDLimit}
          mongodb_no_journal: {get_param: MongoDbNoJournal}
          mongodb_ipv6: {get_param: MongoDbIPv6}
 -        # We need to force this into quotes or hiera will return integer causing
 -        # the puppet module validation regexp to fail.
 -        # Remove when: https://github.com/puppetlabs/puppetlabs-rabbitmq/pull/401
 -        rabbit_fd_limit:
 -          str_replace:
 -            template: "'LIMIT'"
 -            params:
 -              LIMIT: {get_param: RabbitFDLimit}
          ntp_servers: {get_param: NtpServer}
          timezone: {get_param: TimeZone}
          control_virtual_interface: {get_param: ControlVirtualInterface}