summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-18 02:46:31 +0000
committerGerrit Code Review <review@openstack.org>2019-01-18 02:46:31 +0000
commit717b94c2c3e6c8bcf3427d3bd729167465d8d81d (patch)
tree0b763e858d2f76ff35aca7ecdd8034274ab0e361
parent67a81e4e963aef393fda485b6ab730ccd84b92d4 (diff)
parenta51a9f9465f351d57188104a7a5da36f6e28c004 (diff)
downloaddesignate-717b94c2c3e6c8bcf3427d3bd729167465d8d81d.tar.gz
Merge "nit: remove downgrade methods and add release note"
-rw-r--r--designate/storage/impl_sqlalchemy/migrate_repo/versions/101_support_naptr_records.py15
-rw-r--r--designate/storage/impl_sqlalchemy/migrate_repo/versions/102_support_caa_records.py15
-rw-r--r--releasenotes/notes/CAA_NAPTR_records-5e2e466a5bc18a31.yaml6
3 files changed, 6 insertions, 30 deletions
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/101_support_naptr_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/101_support_naptr_records.py
index 4c03e6e8..7cd91ea7 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/101_support_naptr_records.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/101_support_naptr_records.py
@@ -27,18 +27,3 @@ def upgrade(migrate_engine):
records_table = Table('recordsets', meta, autoload=True)
records_table.columns.type.alter(name='type', type=Enum(*RECORD_TYPES))
-
-
-def downgrade(migrate_engine):
- meta.bind = migrate_engine
-
- RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'SRV', 'TXT', 'SPF', 'NS',
- 'PTR', 'SSHFP', 'SOA']
-
- records_table = Table('recordsets', meta, autoload=True)
-
- # Delete all NAPTR records
- records_table.filter_by(name='type', type='NAPTR').delete()
-
- # Remove CAA from the ENUM
- records_table.columns.type.alter(type=Enum(*RECORD_TYPES))
diff --git a/designate/storage/impl_sqlalchemy/migrate_repo/versions/102_support_caa_records.py b/designate/storage/impl_sqlalchemy/migrate_repo/versions/102_support_caa_records.py
index 1bf61572..32ec4fcd 100644
--- a/designate/storage/impl_sqlalchemy/migrate_repo/versions/102_support_caa_records.py
+++ b/designate/storage/impl_sqlalchemy/migrate_repo/versions/102_support_caa_records.py
@@ -27,18 +27,3 @@ def upgrade(migrate_engine):
records_table = Table('recordsets', meta, autoload=True)
records_table.columns.type.alter(name='type', type=Enum(*RECORD_TYPES))
-
-
-def downgrade(migrate_engine):
- meta.bind = migrate_engine
-
- RECORD_TYPES = ['A', 'AAAA', 'CNAME', 'MX', 'SRV', 'TXT', 'SPF', 'NS',
- 'PTR', 'SSHFP', 'SOA', 'NAPTR']
-
- records_table = Table('recordsets', meta, autoload=True)
-
- # Delete all CAA records
- records_table.filter_by(name='type', type='CAA').delete()
-
- # Remove CAA from the ENUM
- records_table.columns.type.alter(type=Enum(*RECORD_TYPES))
diff --git a/releasenotes/notes/CAA_NAPTR_records-5e2e466a5bc18a31.yaml b/releasenotes/notes/CAA_NAPTR_records-5e2e466a5bc18a31.yaml
new file mode 100644
index 00000000..5dd4667a
--- /dev/null
+++ b/releasenotes/notes/CAA_NAPTR_records-5e2e466a5bc18a31.yaml
@@ -0,0 +1,6 @@
+---
+features:
+ - |
+ CAA and NAPTR recordset types have been added. All users should be able to use these types
+ from the API and openstack client. These can be disabled (like other record types) by
+ setting the `[DEFAULT].supported-record-type` config variable in all designate services.