openstack/trove
Code Issues Proposed changes

Merge "Move guestagent settings to default section"

Browse Source
This commit is contained in:
Jenkins 2015-05-28 22:03:38 +00:00 committed by Gerrit Code Review
commit 0f3d242548
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/trove/trove-taskmanager.conf.sample
View File

@ -178,6 +178,14 @@ pydev_debug = disabled
# path to pydevd library. It will be used if pydevd is absent in sys.path # path to pydevd library. It will be used if pydevd is absent in sys.path
#pydev_path = <path> #pydev_path = <path>
# ================= Guestagent related ========================
#guest_config = /etc/trove/trove-guestagent.conf
# Use 'guest_info = /etc/guest_info' for pre-Kilo compatibility
#guest_info = guest_info.conf
# Use 'injected_config_location = /etc/trove' for pre-Kilo compatibility
#injected_config_location = /etc/trove/conf.d
#cloudinit_location = /etc/trove/cloudinit
[database] [database]
# SQLAlchemy connection string for the reference implementation # SQLAlchemy connection string for the reference implementation
@ -195,15 +203,6 @@ connection = mysql://root:e1a2c042c828d3566d0a@localhost/trove
# before MySQL can drop the connection. # before MySQL can drop the connection.
idle_timeout = 3600 idle_timeout = 3600
# ================= Guestagent related ========================
#guest_config = /etc/trove/trove-guestagent.conf
# Use 'guest_info = /etc/guest_info' for pre-Kilo compatibility
#guest_info = guest_info.conf
# Use 'injected_config_location = /etc/trove' for pre-Kilo compatibility
#injected_config_location = /etc/trove/conf.d
#cloudinit_location = /etc/trove/cloudinit
# ================= Security groups related ======================== # ================= Security groups related ========================
# Each future datastore implementation should implement # Each future datastore implementation should implement
# its own oslo group with defined in it: # its own oslo group with defined in it: