diff options
author | Patrick Galbraith <patg@patg.net> | 2013-12-05 07:57:53 -0500 |
---|---|---|
committer | Kiall Mac Innes <kiall@hp.com> | 2013-12-12 20:07:36 +0000 |
commit | 516bce30a69dfc27ad80a9828695eef4ade4f4e4 (patch) | |
tree | db156248a0cf6ff6a16e5bf6f147e05198a82360 | |
parent | c914bdf9b98e31ed992c6bc6bf04bcc363e06536 (diff) | |
download | designate-516bce30a69dfc27ad80a9828695eef4ade4f4e4.tar.gz |
BUG# 1258262 Added secret parameter to options for sensitive data
Change-Id: Ib523b4df2540fde6972c1dcb9c8485c52f022dc4
-rw-r--r-- | designate/backend/impl_mysqlbind9.py | 3 | ||||
-rw-r--r-- | designate/sqlalchemy/session.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/designate/backend/impl_mysqlbind9.py b/designate/backend/impl_mysqlbind9.py index 62797b83..fc6059e5 100644 --- a/designate/backend/impl_mysqlbind9.py +++ b/designate/backend/impl_mysqlbind9.py @@ -37,7 +37,8 @@ cfg.CONF.register_opts([ cfg.IntOpt('rndc-port', default=953, help='RNDC Port'), cfg.StrOpt('rndc-config-file', default=None, help='RNDC Config File'), - cfg.StrOpt('rndc-key-file', default=None, help='RNDC Key File'), + cfg.StrOpt('rndc-key-file', secret=True, + default=None, help='RNDC Key File'), cfg.StrOpt('dns-server-type', default='master', help='slave or master DNS server?'), cfg.BoolOpt('write-database', default=True, diff --git a/designate/sqlalchemy/session.py b/designate/sqlalchemy/session.py index a3aeee52..f5b5f2c8 100644 --- a/designate/sqlalchemy/session.py +++ b/designate/sqlalchemy/session.py @@ -37,6 +37,7 @@ _ENGINES = {} SQLOPTS = [ cfg.StrOpt('database_connection', default='sqlite:///$state_path/designate.sqlite', + secret=True, help='The database driver to use'), cfg.IntOpt('connection_debug', default=0, help='Verbosity of SQL debugging information. 0=None,' |