diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-07-15 11:44:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-07-15 11:44:28 +0000 |
| commit | 31dc73cbaa86dd723de28eca69d159a4860429dc (patch) | |
| tree | e7943c5b63062b96fce58f3a26f1339931c960ff /puppet | |
| parent | 2b40e39a9b9c79a026c4601620e9d0b383b1cb12 (diff) | |
| parent | e0ed4b315a5e12703a1e1dfc538863425e6ab81e (diff) | |
Merge "Allow a user to disable MongoDB journaling"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 3f01b094..6e399b50 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -378,6 +378,10 @@ parameters: description: The password for the nova service and db account, used by nova-api. type: string hidden: true + MongoDbNoJournal: + default: false + description: Should MongoDb journaling be disabled + type: boolean NtpServer: type: string default: '' @@ -773,6 +777,7 @@ resources: rabbit_cookie: {get_param: RabbitCookie} rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} rabbit_client_port: {get_param: RabbitClientPort} + mongodb_no_journal: {get_param: MongoDbNoJournal} ntp_servers: str_replace: template: '["server"]' @@ -952,6 +957,7 @@ resources: keystone::debug: {get_input: debug} # MongoDB mongodb::server::bind_ip: {get_input: mongo_db_network} + mongodb::server::nojournal: {get_input: mongodb_no_journal} # MySQL admin_password: {get_input: admin_password} enable_galera: {get_input: enable_galera} diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 72c10c26..3cc64971 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -22,6 +22,7 @@ rabbitmq_config_variables: cluster_partition_handling: 'pause_minority' mongodb::server::replset: tripleo +mongodb::server::journal: false redis::port: 6379 redis::sentinel::master_name: "%{hiera('bootstrap_nodeid')}" |