summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/tests/localhost.test.conf2
-rw-r--r--etc/trove/trove-guestagent.conf.sample3
-rw-r--r--etc/trove/trove-logging-guestagent.conf39
-rw-r--r--etc/trove/trove-taskmanager.conf.sample4
-rw-r--r--etc/trove/trove-workbook.yaml19
5 files changed, 64 insertions, 3 deletions
diff --git a/etc/tests/localhost.test.conf b/etc/tests/localhost.test.conf
index 9eb3965a..c834ec58 100644
--- a/etc/tests/localhost.test.conf
+++ b/etc/tests/localhost.test.conf
@@ -125,7 +125,7 @@
],
"examples": {
- "directory":"apidocs/src/samples",
+ "directory":"api-ref/source/samples",
"normal_user_name":"hub_cap",
"normal_user_tenant":"3000",
"admin_user_name":"admin",
diff --git a/etc/trove/trove-guestagent.conf.sample b/etc/trove/trove-guestagent.conf.sample
index 40c0c016..b3b0b509 100644
--- a/etc/trove/trove-guestagent.conf.sample
+++ b/etc/trove/trove-guestagent.conf.sample
@@ -74,6 +74,7 @@ root_grant_option = True
# Directory and path for log files
log_dir = /var/log/trove/
log_file = logfile.txt
+log_config_append = /etc/trove/trove-logging-guestagent.conf
[profiler]
# If False fully disable profiling feature.
@@ -155,7 +156,7 @@ restore_namespace = trove.guestagent.strategies.restore.experimental.cassandra_i
[db2]
# For db2, the following are the defaults for backup, and restore:
-# backup_strategy = DB2Backup
+# backup_strategy = DB2OfflineBackup
# backup_namespace = trove.guestagent.strategies.backup.experimental.db2_impl
# restore_namespace = trove.guestagent.strategies.restore.experimental.db2_impl
diff --git a/etc/trove/trove-logging-guestagent.conf b/etc/trove/trove-logging-guestagent.conf
new file mode 100644
index 00000000..add222df
--- /dev/null
+++ b/etc/trove/trove-logging-guestagent.conf
@@ -0,0 +1,39 @@
+[loggers]
+keys=root
+
+[handlers]
+keys=file
+
+[formatters]
+keys=minimal,normal,debug
+
+###########
+# Loggers #
+###########
+
+[logger_root]
+level=WARNING
+handlers=file
+
+################
+# Log Handlers #
+################
+
+[handler_file]
+class=logging.handlers.RotatingFileHandler
+level=WARNING
+formatter=normal
+args=('/var/log/trove-guestagent.log', 'a', 100 * 1024 * 1024) # log file limit is 100MB
+
+##################
+# Log Formatters #
+##################
+
+[formatter_minimal]
+format=%(message)s
+
+[formatter_normal]
+format=(%(name)s): %(asctime)s %(levelname)s %(message)s
+
+[formatter_debug]
+format=(%(name)s): %(asctime)s %(levelname)s %(module)s %(funcName)s %(message)s
diff --git a/etc/trove/trove-taskmanager.conf.sample b/etc/trove/trove-taskmanager.conf.sample
index 873ad406..69a64ff2 100644
--- a/etc/trove/trove-taskmanager.conf.sample
+++ b/etc/trove/trove-taskmanager.conf.sample
@@ -61,7 +61,7 @@ server_delete_time_out=480
# Nova server boot options
# sets the --config-drive argument when doing a nova boot
# (controls how file injection is handled by nova)
-use_nova_server_config_drive = False
+use_nova_server_config_drive = True
# Configuration options for talking to nova via the novaclient.
# These options are for an admin user in your keystone config.
@@ -216,6 +216,8 @@ rabbit_password=f7999d1955c5014aa32c
#rabbit_virtual_host=/
[mysql]
+# Whether to permit ICMP. default is False.
+icmp = True
# Format (single port or port range): A, B-C
# where C greater than B
tcp_ports = 3306
diff --git a/etc/trove/trove-workbook.yaml b/etc/trove/trove-workbook.yaml
new file mode 100644
index 00000000..d5497133
--- /dev/null
+++ b/etc/trove/trove-workbook.yaml
@@ -0,0 +1,19 @@
+---
+version: '2.0'
+
+name: trove
+
+description: Trove Workflows
+
+workflows:
+
+ backup_create:
+ input: [instance, name, description, incremental]
+ output:
+ status: <% $.message %>
+
+ tasks:
+ backup_create:
+ action: trove.backups_create instance=<% $.instance %> name=<% $.name %> description=<% $.description %> incremental=<% $.incremental %>
+ publish:
+ message: <% 'Backup complete' %>