diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-14 08:00:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-14 08:00:00 +0000 |
| commit | 747e3b29fea38371d53b167ecad812d1701890f4 (patch) | |
| tree | 10da6d13556a96c3aae1c6e198539946ed79ca3a /puppet/controller.yaml | |
| parent | e1238aa903f088f49699cd4c1e10a55655e08ab5 (diff) | |
| parent | 11074fb08f5bb86b1b84065ec1bfada3ad387053 (diff) | |
Merge "Composable roles within services - MongoDB"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 66a5d5e5..aaf87707 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -300,14 +300,6 @@ parameters: default: 0 description: Number of workers for Nova service. type: number - MongoDbNoJournal: - default: false - description: Should MongoDb journaling be disabled - type: boolean - MongoDbIPv6: - default: false - description: Enable IPv6 if Mongo DB VIP is IPv6 - type: boolean NtpServer: default: '' description: Comma-separated list of ntp servers @@ -768,8 +760,6 @@ 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} - mongodb_ipv6: {get_param: MongoDbIPv6} ntp_servers: {get_param: NtpServer} timezone: {get_param: TimeZone} control_virtual_interface: {get_param: ControlVirtualInterface} @@ -936,10 +926,10 @@ resources: keystone::public_bind_host: {get_input: keystone_public_api_network} keystone::wsgi::apache::bind_host: {get_input: keystone_public_api_network} keystone::wsgi::apache::admin_bind_host: {get_input: keystone_admin_api_network} + # MongoDB mongodb::server::bind_ip: {get_input: mongo_db_network} - mongodb::server::nojournal: {get_input: mongodb_no_journal} - mongodb::server::ipv6: {get_input: mongodb_ipv6} + # MySQL admin_password: {get_input: admin_password} enable_galera: {get_input: enable_galera} |