diff --git a/doc/common/tables/trove-api.xml b/doc/common/tables/trove-api.xml
index 48918bf9a7..c530f72b6b 100644
--- a/doc/common/tables/trove-api.xml
+++ b/doc/common/tables/trove-api.xml
@@ -42,8 +42,8 @@
| (StrOpt) No help text available for this option. |
- | hostname_require_ipv4 = True |
- (BoolOpt) Require user hostnames to be IPv4 addresses. |
+ hostname_require_valid_ip = True |
+ (BoolOpt) Require user hostnames to be valid IP addresses. |
| http_delete_rate = 200 |
diff --git a/doc/common/tables/trove-backup.xml b/doc/common/tables/trove-backup.xml
index efdd17d082..6db813f9a7 100644
--- a/doc/common/tables/trove-backup.xml
+++ b/doc/common/tables/trove-backup.xml
@@ -25,10 +25,6 @@
backup_chunk_size = 65536 |
(IntOpt) Chunk size to stream to swift container. This should be in multiples of 128 bytes, since this is the size of an md5 digest block allowing the process to update the file checksum during streaming. See: http://stackoverflow.com/questions/1131220/ |
-
- | backup_incremental_strategy = {'InnoBackupEx': 'InnoBackupExIncremental'} |
- (DictOpt) Incremental Backup Runner based on the default strategy. For strategies that do not implement an incremental, the runner will use the default full backup. |
-
| backup_namespace = trove.guestagent.strategies.backup.mysql_impl |
(StrOpt) Namespace to load backup strategies from. |
diff --git a/doc/common/tables/trove-cluster.xml b/doc/common/tables/trove-cluster.xml
new file mode 100644
index 0000000000..8ce271b888
--- /dev/null
+++ b/doc/common/tables/trove-cluster.xml
@@ -0,0 +1,34 @@
+
+
+
+
+ Description of cluster configuration options
+
+
+
+
+ | Configuration option = Default value |
+ Description |
+
+
+
+
+ | [DEFAULT] |
+
+
+ | cluster_delete_time_out = 180 |
+ (IntOpt) No help text available for this option. |
+
+
+ | cluster_usage_timeout = 675 |
+ (IntOpt) Timeout to wait for a cluster to become active. |
+
+
+ | clusters_page_size = 20 |
+ (IntOpt) No help text available for this option. |
+
+
+
+
diff --git a/doc/common/tables/trove-db_mongodb.xml b/doc/common/tables/trove-db_mongodb.xml
index 787063d468..49cc5ec356 100644
--- a/doc/common/tables/trove-db_mongodb.xml
+++ b/doc/common/tables/trove-db_mongodb.xml
@@ -17,22 +17,46 @@
| [mongodb] |
+
+ | api_strategy = trove.common.strategies.mongodb.api.MongoDbAPIStrategy |
+ (StrOpt) Class that implements datastore-specific API logic. |
+
| backup_strategy = None |
(StrOpt) Default strategy to perform backups. |
+
+ | cluster_support = True |
+ (BoolOpt) Enable clusters to be created and managed. |
+
| device_path = /dev/vdb |
(StrOpt) No help text available for this option. |
+
+ | guestagent_strategy = trove.common.strategies.mongodb.guestagent.MongoDbGuestAgentStrategy |
+ (StrOpt) Class that implements datastore-specific guest agent API logic. |
+
| mount_point = /var/lib/mongodb |
(StrOpt) Filesystem path for mounting volumes if volume support is enabled. |
+
+ | num_config_servers_per_cluster = 3 |
+ (IntOpt) The number of config servers to create per cluster. |
+
+
+ | num_query_routers_per_cluster = 1 |
+ (IntOpt) The number of query routers (mongos) to create per cluster. |
+
| replication_strategy = None |
(StrOpt) Default strategy for replication. |
+
+ | taskmanager_strategy = trove.common.strategies.mongodb.taskmanager.MongoDbTaskManagerStrategy |
+ (StrOpt) Class that implements datastore-specific task manager logic. |
+
| tcp_ports = 2500, 27017 |
(ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). |
diff --git a/doc/common/tables/trove-db_mysql.xml b/doc/common/tables/trove-db_mysql.xml
index c095f8caec..bbab9d4712 100644
--- a/doc/common/tables/trove-db_mysql.xml
+++ b/doc/common/tables/trove-db_mysql.xml
@@ -17,6 +17,10 @@
| [mysql] |
+
+ | backup_incremental_strategy = {'InnoBackupEx': 'InnoBackupExIncremental'} |
+ (DictOpt) Incremental Backup Runner based on the default strategy. For strategies that do not implement an incremental, the runner will use the default full backup. |
+
| backup_namespace = trove.guestagent.strategies.backup.mysql_impl |
(StrOpt) No help text available for this option. |
diff --git a/doc/common/tables/trove-db_percona.xml b/doc/common/tables/trove-db_percona.xml
index 7eff378c67..ea091d6ed5 100644
--- a/doc/common/tables/trove-db_percona.xml
+++ b/doc/common/tables/trove-db_percona.xml
@@ -17,6 +17,10 @@
| [percona] |
+
+ | backup_incremental_strategy = {'InnoBackupEx': 'InnoBackupExIncremental'} |
+ (DictOpt) Incremental Backup Runner based on the default strategy. For strategies that do not implement an incremental, the runner will use the default full backup. |
+
| backup_namespace = trove.guestagent.strategies.backup.mysql_impl |
(StrOpt) No help text available for this option. |
diff --git a/doc/common/tables/trove-db_postgresql.xml b/doc/common/tables/trove-db_postgresql.xml
new file mode 100644
index 0000000000..55aa603fab
--- /dev/null
+++ b/doc/common/tables/trove-db_postgresql.xml
@@ -0,0 +1,66 @@
+
+
+
+
+ Description of PostgreSQL database configuration options
+
+
+
+
+ | Configuration option = Default value |
+ Description |
+
+
+
+
+ | [postgresql] |
+
+
+ | backup_namespace = trove.guestagent.strategies.backup.postgresql_impl |
+ (StrOpt) No help text available for this option. |
+
+
+ | backup_strategy = PgDump |
+ (StrOpt) Default strategy to perform backups. |
+
+
+ | device_path = /dev/vdb |
+ (StrOpt) No help text available for this option. |
+
+
+ | ignore_dbs = postgres |
+ (ListOpt) No help text available for this option. |
+
+
+ | ignore_users = os_admin, postgres, root |
+ (ListOpt) No help text available for this option. |
+
+
+ | mount_point = /var/lib/postgresql |
+ (StrOpt) Filesystem path for mounting volumes if volume support is enabled. |
+
+
+ | restore_namespace = trove.guestagent.strategies.restore.postgresql_impl |
+ (StrOpt) No help text available for this option. |
+
+
+ | root_on_create = False |
+ (BoolOpt) Enable the automatic creation of the root user for the service during instance-create. The generated password for the root user is immediately returned in the response of instance-create as the 'password' field. |
+
+
+ | tcp_ports = 5432 |
+ (ListOpt) List of TCP ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). |
+
+
+ | udp_ports = |
+ (ListOpt) List of UPD ports and/or port ranges to open in the security group (only applicable if trove_security_groups_support is True). |
+
+
+ | volume_support = True |
+ (BoolOpt) Whether to provision a cinder volume for datadir. |
+
+
+
+
diff --git a/doc/common/tables/trove-guestagent.xml b/doc/common/tables/trove-guestagent.xml
index b7720b6a8b..95589b7109 100644
--- a/doc/common/tables/trove-guestagent.xml
+++ b/doc/common/tables/trove-guestagent.xml
@@ -18,7 +18,7 @@
[DEFAULT] |
- | agent_call_high_timeout = 60 |
+ agent_call_high_timeout = 1000 |
(IntOpt) No help text available for this option. |
diff --git a/doc/config-reference/ch_databaseserviceconfigure.xml b/doc/config-reference/ch_databaseserviceconfigure.xml
index fdcded5414..828f5b48d8 100644
--- a/doc/config-reference/ch_databaseserviceconfigure.xml
+++ b/doc/config-reference/ch_databaseserviceconfigure.xml
@@ -17,6 +17,7 @@
+
diff --git a/doc/config-reference/database-service/section-databaseservice-db.xml b/doc/config-reference/database-service/section-databaseservice-db.xml
index cffad95304..bbee694fa4 100644
--- a/doc/config-reference/database-service/section-databaseservice-db.xml
+++ b/doc/config-reference/database-service/section-databaseservice-db.xml
@@ -14,5 +14,6 @@
+
diff --git a/tools/autogenerate-config-flagmappings/trove.flagmappings b/tools/autogenerate-config-flagmappings/trove.flagmappings
index 21e84833e3..c3dcc80019 100644
--- a/tools/autogenerate-config-flagmappings/trove.flagmappings
+++ b/tools/autogenerate-config-flagmappings/trove.flagmappings
@@ -10,7 +10,6 @@ backdoor_port debug
backlog debug
backup_aes_cbc_key backup
backup_chunk_size backup
-backup_incremental_strategy backup
backup_namespace backup
backup_runner backup
backup_runner_options backup
@@ -29,6 +28,9 @@ cinder_service_type volume
cinder_url volume
cinder_volume_type volume
cloudinit_location taskmanager
+cluster_delete_time_out cluster
+cluster_usage_timeout cluster
+clusters_page_size cluster
conductor_manager amqp
conductor_queue amqp
configurations_page_size common
@@ -73,7 +75,7 @@ heat_service_type heat
heat_time_out heat
heat_url heat
host common
-hostname_require_ipv4 api
+hostname_require_valid_ip api
http_delete_rate api
http_get_rate api
http_mgmt_post_rate api
@@ -264,13 +266,20 @@ matchmaker_redis/host redis
matchmaker_redis/password redis
matchmaker_redis/port redis
matchmaker_ring/ringfile redis
+mongodb/api_strategy db_mongodb
mongodb/backup_strategy db_mongodb
+mongodb/cluster_support db_mongodb
mongodb/device_path db_mongodb
+mongodb/guestagent_strategy db_mongodb
mongodb/mount_point db_mongodb
+mongodb/num_config_servers_per_cluster db_mongodb
+mongodb/num_query_routers_per_cluster db_mongodb
mongodb/replication_strategy db_mongodb
+mongodb/taskmanager_strategy db_mongodb
mongodb/tcp_ports db_mongodb
mongodb/udp_ports db_mongodb
mongodb/volume_support db_mongodb
+mysql/backup_incremental_strategy db_mysql
mysql/backup_namespace db_mysql
mysql/backup_strategy db_mysql
mysql/device_path db_mysql
@@ -285,6 +294,7 @@ mysql/tcp_ports db_mysql
mysql/udp_ports db_mysql
mysql/usage_timeout db_mysql
mysql/volume_support db_mysql
+percona/backup_incremental_strategy db_percona
percona/backup_namespace db_percona
percona/backup_strategy db_percona
percona/device_path db_percona
@@ -299,6 +309,17 @@ percona/tcp_ports db_percona
percona/udp_ports db_percona
percona/usage_timeout db_percona
percona/volume_support db_percona
+postgresql/backup_namespace db_postgresql
+postgresql/backup_strategy db_postgresql
+postgresql/device_path db_postgresql
+postgresql/ignore_dbs db_postgresql
+postgresql/ignore_users db_postgresql
+postgresql/mount_point db_postgresql
+postgresql/restore_namespace db_postgresql
+postgresql/root_on_create db_postgresql
+postgresql/tcp_ports db_postgresql
+postgresql/udp_ports db_postgresql
+postgresql/volume_support db_postgresql
redis/backup_strategy db_redis
redis/device_path db_redis
redis/mount_point db_redis
diff --git a/tools/autogenerate-config-flagmappings/trove.headers b/tools/autogenerate-config-flagmappings/trove.headers
index 3a5fc915ff..8671a96e78 100644
--- a/tools/autogenerate-config-flagmappings/trove.headers
+++ b/tools/autogenerate-config-flagmappings/trove.headers
@@ -1,9 +1,11 @@
backup backup
+cluster cluster
db_cassandra Cassandra database
db_couchbase Couchbase database
db_mongodb MongoDB database
db_mysql MySQL database
db_percona Percona database
+db_postgresql PostgreSQL database
db_redis Redis database
dns DNS
guestagent guest agent