diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-02 16:57:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-02 16:57:11 +0000 |
| commit | 3d74ec0dfa36b393b790d4f140715c2d3348b7e4 (patch) | |
| tree | 537f13b850017e9ac31881cc9d4acde5dabf8221 | |
| parent | b9c46e1cb556234a1f4caee21d98a4fd67b1d27c (diff) | |
| parent | 63f7db59a86e196f601278d38d236d15148990b6 (diff) | |
| download | designate-3d74ec0dfa36b393b790d4f140715c2d3348b7e4.tar.gz | |
Merge "Fix min_ttl config to be an IntOpt"
| -rw-r--r-- | designate/central/__init__.py | 2 | ||||
| -rw-r--r-- | designate/tests/test_central/test_service.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/designate/central/__init__.py b/designate/central/__init__.py index ff0ee099..b9c6eb8a 100644 --- a/designate/central/__init__.py +++ b/designate/central/__init__.py @@ -36,7 +36,7 @@ cfg.CONF.register_opts([ cfg.StrOpt('managed_resource_tenant_id', default="00000000-0000-0000-0000-000000000000", help="The Tenant ID that will own any managed resources."), - cfg.StrOpt('min_ttl', default=None, help="Minimum TTL allowed"), + cfg.IntOpt('min_ttl', default=None, help="Minimum TTL allowed"), # TODO(betsy): Move to Pool Service once that is written cfg.StrOpt('default_pool_id', default='794ccc2c-d751-44fe-b57f-8894c9f5c842', diff --git a/designate/tests/test_central/test_service.py b/designate/tests/test_central/test_service.py index 6ecb25d4..70959c6b 100644 --- a/designate/tests/test_central/test_service.py +++ b/designate/tests/test_central/test_service.py @@ -215,7 +215,7 @@ class CentralServiceTest(CentralTestCase): def test_is_valid_ttl(self): self.policy({'use_low_ttl': '!'}) - self.config(min_ttl="100", + self.config(min_ttl=100, group='service:central') context = self.get_context() @@ -667,7 +667,7 @@ class CentralServiceTest(CentralTestCase): def test_create_domain_invalid_ttl_fail(self): self.policy({'use_low_ttl': '!'}) - self.config(min_ttl="100", + self.config(min_ttl=100, group='service:central') context = self.get_context() @@ -1122,7 +1122,7 @@ class CentralServiceTest(CentralTestCase): def test_create_invalid_recordset_ttl(self): self.policy({'use_low_ttl': '!'}) - self.config(min_ttl="100", + self.config(min_ttl=100, group='service:central') domain = self.create_domain() |