From e2bea4c60973588f3021ab3a747a584c17e386ae Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 18 Dec 2019 09:42:38 +0100 Subject: [PATCH] Retire repository Fuel (from openstack namespace) and fuel-ccp (in x namespace) repositories are unused and ready to retire. This change removes all content from the repository and adds the usual README file to point out that the repository is retired following the process from https://docs.openstack.org/infra/manual/drivers.html#retiring-a-project See also http://lists.openstack.org/pipermail/openstack-discuss/2019-December/011647.html Depends-On: https://review.opendev.org/699362 Change-Id: I1b7169982cea5d047175d19e880c94a7b8cadcc2 --- .gitignore | 68 ------- LICENSE | 175 ------------------- README.rst | 10 ++ docker/designate-agent/Dockerfile.j2 | 4 - docker/designate-api/Dockerfile.j2 | 9 - docker/designate-backend-bind9/Dockerfile.j2 | 13 -- docker/designate-base/Dockerfile.j2 | 16 -- docker/designate-base/designate_sudoers | 1 - docker/designate-central/Dockerfile.j2 | 4 - docker/designate-mdns/Dockerfile.j2 | 4 - docker/designate-pool-manager/Dockerfile.j2 | 12 -- docker/designate-sink/Dockerfile.j2 | 4 - docker/designate-upgrade/Dockerfile.j2 | 7 - docker/designate-worker/Dockerfile.j2 | 8 - docker/designate-zone-manager/Dockerfile.j2 | 4 - service/designate-agent.yaml | 17 -- service/designate-api.yaml | 101 ----------- service/designate-central.yaml | 17 -- service/designate-mdns.yaml | 78 --------- service/designate-pool-manager.yaml | 56 ------ service/designate-sink.yaml | 17 -- service/designate-zone-manager.yaml | 17 -- service/files/api-paste.ini.j2 | 66 ------- service/files/backup.sh.j2 | 10 -- service/files/bind9-pools.yaml.j2 | 27 --- service/files/defaults.yaml | 62 ------- service/files/designate.conf.j2 | 161 ----------------- service/files/named.conf.j2 | 12 -- service/files/named.conf.options.j2 | 39 ----- service/files/nginx-api.conf.j2 | 9 - service/files/pools.yaml.j2 | 11 -- service/files/rndc.conf.j2 | 8 - service/files/rndc.key.j2 | 4 - service/files/server-cert.pem.j2 | 1 - service/files/server-key.pem.j2 | 1 - service/files/upstreams.conf.j2 | 3 - service/upgrade/default.yaml | 56 ------ tools/yamllint.sh | 6 - tools/yamllint.yaml | 21 --- tox.ini | 17 -- 40 files changed, 10 insertions(+), 1146 deletions(-) delete mode 100644 .gitignore delete mode 100644 LICENSE create mode 100644 README.rst delete mode 100644 docker/designate-agent/Dockerfile.j2 delete mode 100644 docker/designate-api/Dockerfile.j2 delete mode 100644 docker/designate-backend-bind9/Dockerfile.j2 delete mode 100644 docker/designate-base/Dockerfile.j2 delete mode 100644 docker/designate-base/designate_sudoers delete mode 100644 docker/designate-central/Dockerfile.j2 delete mode 100644 docker/designate-mdns/Dockerfile.j2 delete mode 100644 docker/designate-pool-manager/Dockerfile.j2 delete mode 100644 docker/designate-sink/Dockerfile.j2 delete mode 100644 docker/designate-upgrade/Dockerfile.j2 delete mode 100644 docker/designate-worker/Dockerfile.j2 delete mode 100644 docker/designate-zone-manager/Dockerfile.j2 delete mode 100644 service/designate-agent.yaml delete mode 100644 service/designate-api.yaml delete mode 100644 service/designate-central.yaml delete mode 100644 service/designate-mdns.yaml delete mode 100644 service/designate-pool-manager.yaml delete mode 100644 service/designate-sink.yaml delete mode 100644 service/designate-zone-manager.yaml delete mode 100644 service/files/api-paste.ini.j2 delete mode 100644 service/files/backup.sh.j2 delete mode 100644 service/files/bind9-pools.yaml.j2 delete mode 100644 service/files/defaults.yaml delete mode 100644 service/files/designate.conf.j2 delete mode 100644 service/files/named.conf.j2 delete mode 100644 service/files/named.conf.options.j2 delete mode 100644 service/files/nginx-api.conf.j2 delete mode 100644 service/files/pools.yaml.j2 delete mode 100644 service/files/rndc.conf.j2 delete mode 100644 service/files/rndc.key.j2 delete mode 100644 service/files/server-cert.pem.j2 delete mode 100644 service/files/server-key.pem.j2 delete mode 100644 service/files/upstreams.conf.j2 delete mode 100644 service/upgrade/default.yaml delete mode 100755 tools/yamllint.sh delete mode 100644 tools/yamllint.yaml delete mode 100644 tox.ini diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a090978..0000000 --- a/.gitignore +++ /dev/null @@ -1,68 +0,0 @@ -*.py[cod] - -# C extensions -*.so - -# Packages -*.egg -*.egg-info -dist -build -.eggs -eggs -parts -bin -var -sdist -develop-eggs -.installed.cfg -lib -lib64 - -# Installer logs -pip-log.txt - -# Unit test / coverage reports -.coverage -cover -.tox -nosetests.xml -.testrepository -.venv - -# Translations -*.mo - -# Mr Developer -.mr.developer.cfg -.project -.pydevproject - -# Complexity -output/*.html -output/*/index.html - -# Sphinx -doc/build - -# oslo-config-generator -etc/*.sample - -# pbr generates these -AUTHORS -ChangeLog - -# Editors -*~ -.*.swp -.*sw? - -# Vagrant -.vagrant -vagrant/Vagrantfile.custom -vagrant/vagrantkey* - -# generated openrc -openrc - -tests/.cache* \ No newline at end of file diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 67db858..0000000 --- a/LICENSE +++ /dev/null @@ -1,175 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. diff --git a/README.rst b/README.rst new file mode 100644 index 0000000..86e34d6 --- /dev/null +++ b/README.rst @@ -0,0 +1,10 @@ +This project is no longer maintained. + +The contents of this repository are still available in the Git +source code management system. To see the contents of this +repository before it reached its end of life, please check out the +previous commit with "git checkout HEAD^1". + +For any further questions, please email +openstack-discuss@lists.openstack.org or join #openstack-dev on +Freenode. diff --git a/docker/designate-agent/Dockerfile.j2 b/docker/designate-agent/Dockerfile.j2 deleted file mode 100644 index f6862df..0000000 --- a/docker/designate-agent/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -USER designate diff --git a/docker/designate-api/Dockerfile.j2 b/docker/designate-api/Dockerfile.j2 deleted file mode 100644 index 150f9f9..0000000 --- a/docker/designate-api/Dockerfile.j2 +++ /dev/null @@ -1,9 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -#mysql-client only for provisioning need to be removed later -RUN apt-get install -y --no-install-recommends \ - mysql-client \ - && apt-get clean - -USER designate diff --git a/docker/designate-backend-bind9/Dockerfile.j2 b/docker/designate-backend-bind9/Dockerfile.j2 deleted file mode 100644 index c743614..0000000 --- a/docker/designate-backend-bind9/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -RUN apt-get update -y \ - && apt-get install -y --no-install-recommends \ - --no-install-suggests \ - bind9 - -RUN mkdir -p /var/run/named /etc/bind \ - && chmod 775 /var/run/named \ - && chown root:bind /var/run/named - -RUN apt-get clean diff --git a/docker/designate-base/Dockerfile.j2 b/docker/designate-base/Dockerfile.j2 deleted file mode 100644 index 7e593dd..0000000 --- a/docker/designate-base/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ image_spec("openstack-base") }} -MAINTAINER {{ maintainer }} - -{{ copy_sources("openstack/designate", "/designate") }} - -RUN useradd --user-group -G microservices designate \ - && /var/lib/microservices/venv/bin/pip install --upgrade /designate \ - && mkdir -p /var/lib/designate /etc/designate /var/log/designate \ - && cp -r /designate/etc/designate/* /etc/designate/ \ - && mv /etc/designate/rootwrap.conf.sample /etc/designate/rootwrap.conf \ - && chown -R designate:designate /var/log/designate /etc/designate /var/lib/designate \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/microservices/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/designate/rootwrap.conf - -COPY designate_sudoers /etc/sudoers.d/designate_sudoers -RUN chmod 750 /etc/sudoers.d /etc/designate/rootwrap.d/ \ - && chmod 440 /etc/sudoers.d/designate_sudoers diff --git a/docker/designate-base/designate_sudoers b/docker/designate-base/designate_sudoers deleted file mode 100644 index f02bc5e..0000000 --- a/docker/designate-base/designate_sudoers +++ /dev/null @@ -1 +0,0 @@ -designate ALL = (root) NOPASSWD: /var/lib/microservices/venv/bin/designate-rootwrap /etc/designate/rootwrap.conf * diff --git a/docker/designate-central/Dockerfile.j2 b/docker/designate-central/Dockerfile.j2 deleted file mode 100644 index f6862df..0000000 --- a/docker/designate-central/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -USER designate diff --git a/docker/designate-mdns/Dockerfile.j2 b/docker/designate-mdns/Dockerfile.j2 deleted file mode 100644 index f6862df..0000000 --- a/docker/designate-mdns/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -USER designate diff --git a/docker/designate-pool-manager/Dockerfile.j2 b/docker/designate-pool-manager/Dockerfile.j2 deleted file mode 100644 index 09b4fa4..0000000 --- a/docker/designate-pool-manager/Dockerfile.j2 +++ /dev/null @@ -1,12 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -#mysql-client only for provisioning need to be removed later -RUN apt-get update -y \ - && apt-get install -y --no-install-recommends mysql-client bind9 \ - && apt-get clean \ - && mkdir -p /etc/bind \ - && chown -R designate:designate /etc/bind - -USER designate - diff --git a/docker/designate-sink/Dockerfile.j2 b/docker/designate-sink/Dockerfile.j2 deleted file mode 100644 index f6862df..0000000 --- a/docker/designate-sink/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -USER designate diff --git a/docker/designate-upgrade/Dockerfile.j2 b/docker/designate-upgrade/Dockerfile.j2 deleted file mode 100644 index ce93e38..0000000 --- a/docker/designate-upgrade/Dockerfile.j2 +++ /dev/null @@ -1,7 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -RUN apt-get install -y --no-install-recommends \ - mysql-client \ - && apt-get clean - diff --git a/docker/designate-worker/Dockerfile.j2 b/docker/designate-worker/Dockerfile.j2 deleted file mode 100644 index 1493962..0000000 --- a/docker/designate-worker/Dockerfile.j2 +++ /dev/null @@ -1,8 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -RUN apt-get update -y \ - && apt-get install -y --no-install-recommends bind9 \ - && apt-get clean \ - && mkdir -p /etc/bind \ - && chown -R designate:designate /etc/bind diff --git a/docker/designate-zone-manager/Dockerfile.j2 b/docker/designate-zone-manager/Dockerfile.j2 deleted file mode 100644 index f6862df..0000000 --- a/docker/designate-zone-manager/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ image_spec("designate-base") }} -MAINTAINER {{ maintainer }} - -USER designate diff --git a/service/designate-agent.yaml b/service/designate-agent.yaml deleted file mode 100644 index 9b8d0eb..0000000 --- a/service/designate-agent.yaml +++ /dev/null @@ -1,17 +0,0 @@ -dsl_version: 0.5.0 -service: - name: designate-agent - containers: - - name: designate-agent - image: designate-agent - daemon: - dependencies: - - designate-api - files: - - designate-conf - command: designate-agent --config-file /etc/designate/designate.conf - -files: - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 diff --git a/service/designate-api.yaml b/service/designate-api.yaml deleted file mode 100644 index e06e2aa..0000000 --- a/service/designate-api.yaml +++ /dev/null @@ -1,101 +0,0 @@ -dsl_version: 0.5.0 -service: - name: designate-api - ports: - - {{ designate.api_port }} - containers: - - name: designate-api - image: designate-api - pre: - - name: designate-main-db-create - dependencies: - - database - type: single - command: - mysql -u root -p{{ db.root_password }} -h {{ address('database') }} -e "create database {{ designate.db.name.main_database }}; - create user '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}' - {% if db.tls.enabled %} require ssl {% endif %}; - grant all privileges on {{ designate.db.name.main_database }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}' - {% if db.tls.enabled %} require ssl {% endif %};" - - name: designate-syncdb - dependencies: - - designate-main-db-create - files: - - designate-conf - type: single - command: designate-manage --config-file /etc/designate/designate.conf database sync - - name: designate-user-create - dependencies: - - keystone-create-domain - type: single - command: openstack user create --domain {{ service_account.domain }} --password {{ designate.password }} {{ designate.username }} - - name: designate-admin-role-add - dependencies: - - designate-user-create - - keystone-create-project - type: single - command: openstack role add --project {{ service_account.project }} --user {{ designate.username }} admin - - name: designate-service-create - dependencies: - - keystone-create-project - type: single - command: openstack service create --name designate --description "Designate Service" dns - - name: designate-public-endpoint-create - dependencies: - - designate-service-create - type: single - command: openstack endpoint create --region RegionOne dns public {{ address('designate-api', designate.api_port, external=True, with_scheme=True) }} - - name: designate-internal-endpoint-create - dependencies: - - designate-service-create - type: single - command: openstack endpoint create --region RegionOne dns internal {{ address('designate-api', designate.api_port, with_scheme=True) }} - - name: designate-admin-endpoint-create - dependencies: - - designate-service-create - type: single - command: openstack endpoint create --region RegionOne dns admin {{ address('designate-api', designate.api_port, with_scheme=True) }} - daemon: - dependencies: - - rpc - files: - - designate-conf - - api-paste - command: designate-api --config-file /etc/designate/designate.conf - # {% if designate.tls.enabled %} - - name: nginx-designate-api - image: nginx - daemon: - files: - - upstreams - - servers - - server-cert - - server-key - command: nginx - # {% endif %} - -files: - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 - api-paste: - path: /etc/designate/api-paste.ini - content: api-paste.ini.j2 - # {% if designate.tls.enabled %} - servers: - path: /etc/nginx/conf.d/servers.conf - content: nginx-api.conf.j2 - perm: "0400" - upstreams: - path: /etc/nginx/conf.d/upstreams.conf - content: upstreams.conf.j2 - perm: "0400" - server-cert: - path: /opt/ccp/etc/tls/server-cert.pem - content: server-cert.pem.j2 - perm: "0400" - server-key: - path: /opt/ccp/etc/tls/server-key.pem - content: server-key.pem.j2 - perm: "0400" - # {% endif %} diff --git a/service/designate-central.yaml b/service/designate-central.yaml deleted file mode 100644 index 4300f24..0000000 --- a/service/designate-central.yaml +++ /dev/null @@ -1,17 +0,0 @@ -dsl_version: 0.5.0 -service: - name: designate-central - containers: - - name: designate-central - image: designate-central - daemon: - dependencies: - - designate-api - files: - - designate-conf - command: designate-central --config-file /etc/designate/designate.conf - -files: - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 diff --git a/service/designate-mdns.yaml b/service/designate-mdns.yaml deleted file mode 100644 index 0b275e2..0000000 --- a/service/designate-mdns.yaml +++ /dev/null @@ -1,78 +0,0 @@ -dsl_version: 0.5.0 -service: - name: designate-mdns - ports: - - {{ designate.bind_port }} - - {{ designate.worker_port }} - - {{ designate.mdns_port }} - - {{ designate.rndc_port }} - containers: - - name: designate-mdns - image: designate-mdns - daemon: - dependencies: - - designate-api - files: - - designate-conf - command: designate-mdns --config-file /etc/designate/designate.conf - - name: designate-backend-bind9 - image: designate-backend-bind9 - daemon: - files: - - named-conf-options - - rndc-conf - - named-conf - - rndc-key - command: /usr/sbin/named -g -c /etc/bind/named.conf -u bind - - name: designate-worker - image: designate-worker - pre: - - name: designate-pool-update - # {% if designate.backend == "bind9" %} - dependencies: - - designate-backend-bind9 - # {% endif %} - files: - # {% if designate.backend == "bind9" %} - - bind9-pools - # {% else %} - - fake-pools - # {% endif %} - - designate-conf - type: local - command: designate-manage pool update --file /etc/designate/pools.yaml - daemon: - dependencies: - - designate-api - files: - # {% if designate.backend == "bind9" %} - - bind9-pools - # {% else %} - - fake-pools - # {% endif %} - - designate-conf - - rndc-conf - - rndc-key - command: designate-worker --config-file /etc/designate/designate.conf -files: - rndc-conf: - path: /etc/bind/rndc.conf - content: rndc.conf.j2 - named-conf-options: - path: /etc/bind/named.conf.options - content: named.conf.options.j2 - named-conf: - path: /etc/bind/named.conf - content: named.conf.j2 - rndc-key: - path: /etc/bind/rndc.key - content: rndc.key.j2 - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 - fake-pools: - path: /etc/designate/pools.yaml - content: pools.yaml.j2 - bind9-pools: - path: /etc/designate/pools.yaml - content: bind9-pools.yaml.j2 diff --git a/service/designate-pool-manager.yaml b/service/designate-pool-manager.yaml deleted file mode 100644 index 52e657d..0000000 --- a/service/designate-pool-manager.yaml +++ /dev/null @@ -1,56 +0,0 @@ -dsl_version: 0.5.0 -service: - name: designate-pool-manager - containers: - - name: designate-pool-manager - image: designate-pool-manager - pre: - - name: designate-pool-manager-db-create - dependencies: - - database - - designate-main-db-create - type: single - command: - mysql -u root -p{{ db.root_password }} -h {{ address('database') }} -e "create database {{ designate.db.name.pool_manager }}; - grant all privileges on {{ designate.db.name.pool_manager }}.* to '{{ designate.db.username }}'@'%' identified by '{{ designate.db.password }}' - {% if db.tls.enabled %} require ssl {% endif %};" - - name: designate-pool-update - dependencies: - - designate-pool-manager-db-create - files: - - pools - - designate-conf - type: single - command: designate-manage pool update --file /etc/designate/pools.yaml - - name: designate-pool-sync - dependencies: - - designate-pool-update - files: - - designate-conf - type: single - command: designate-manage --config-file /etc/designate/designate.conf pool-manager-cache sync - daemon: - dependencies: - - designate-api - files: - - designate-conf - - rndc-conf - - rndc-key - command: designate-pool-manager --config-file /etc/designate/designate.conf - -files: - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 - pools: - path: /etc/designate/pools.yaml - content: pools.yaml.j2 - named-conf: - path: /etc/bind/named.conf.options - content: named.conf.options.j2 - rndc-conf: - path: /etc/bind/rndc.conf - content: rndc.conf.j2 - rndc-key: - path: /etc/bind/rndc.key - content: rndc.key.j2 diff --git a/service/designate-sink.yaml b/service/designate-sink.yaml deleted file mode 100644 index d470d31..0000000 --- a/service/designate-sink.yaml +++ /dev/null @@ -1,17 +0,0 @@ -dsl_version: 0.5.0 -service: - name: designate-sink - containers: - - name: designate-sink - image: designate-sink - daemon: - dependencies: - - designate-api - files: - - designate-conf - command: designate-sink --config-file /etc/designate/designate.conf - -files: - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 diff --git a/service/designate-zone-manager.yaml b/service/designate-zone-manager.yaml deleted file mode 100644 index bf333e2..0000000 --- a/service/designate-zone-manager.yaml +++ /dev/null @@ -1,17 +0,0 @@ -dsl_version: 0.5.0 -service: - name: designate-zone-manager - containers: - - name: designate-zone-manager - image: designate-zone-manager - daemon: - dependencies: - - designate-api - files: - - designate-conf - command: designate-zone-manager --config-file /etc/designate/designate.conf - -files: - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 diff --git a/service/files/api-paste.ini.j2 b/service/files/api-paste.ini.j2 deleted file mode 100644 index 7daf9f4..0000000 --- a/service/files/api-paste.ini.j2 +++ /dev/null @@ -1,66 +0,0 @@ -[composite:osapi_dns] -use = egg:Paste#urlmap -/: osapi_dns_versions -/v1: osapi_dns_v1 -/v2: osapi_dns_v2 -/admin: osapi_dns_admin - -[pipeline:osapi_dns_versions] -pipeline = maintenance faultwrapper ssl osapi_dns_app_versions - -[app:osapi_dns_app_versions] -paste.app_factory = designate.api.versions:factory - -[composite:osapi_dns_v1] -use = call:designate.api.middleware:auth_pipeline_factory -noauth = request_id noauthcontext maintenance validation_API_v1 faultwrapper ssl normalizeuri osapi_dns_app_v1 -keystone = request_id authtoken keystonecontext maintenance validation_API_v1 faultwrapper ssl normalizeuri osapi_dns_app_v1 - -[app:osapi_dns_app_v1] -paste.app_factory = designate.api.v1:factory - -[composite:osapi_dns_v2] -use = call:designate.api.middleware:auth_pipeline_factory -noauth = request_id faultwrapper ssl validation_API_v2 noauthcontext maintenance normalizeuri osapi_dns_app_v2 -keystone = request_id faultwrapper ssl validation_API_v2 authtoken keystonecontext maintenance normalizeuri osapi_dns_app_v2 - -[app:osapi_dns_app_v2] -paste.app_factory = designate.api.v2:factory - -[composite:osapi_dns_admin] -use = call:designate.api.middleware:auth_pipeline_factory -noauth = request_id faultwrapper ssl noauthcontext maintenance normalizeuri osapi_dns_app_admin -keystone = request_id faultwrapper ssl authtoken keystonecontext maintenance normalizeuri osapi_dns_app_admin - -[app:osapi_dns_app_admin] -paste.app_factory = designate.api.admin:factory - -[filter:request_id] -paste.filter_factory = oslo_middleware:RequestId.factory - -[filter:noauthcontext] -paste.filter_factory = designate.api.middleware:NoAuthContextMiddleware.factory - -[filter:authtoken] -paste.filter_factory = keystonemiddleware.auth_token:filter_factory - -[filter:keystonecontext] -paste.filter_factory = designate.api.middleware:KeystoneContextMiddleware.factory - -[filter:maintenance] -paste.filter_factory = designate.api.middleware:MaintenanceMiddleware.factory - -[filter:normalizeuri] -paste.filter_factory = designate.api.middleware:NormalizeURIMiddleware.factory - -[filter:faultwrapper] -paste.filter_factory = designate.api.middleware:FaultWrapperMiddleware.factory - -[filter:validation_API_v1] -paste.filter_factory = designate.api.middleware:APIv1ValidationErrorMiddleware.factory - -[filter:validation_API_v2] -paste.filter_factory = designate.api.middleware:APIv2ValidationErrorMiddleware.factory - -[filter:ssl] -paste.filter_factory = designate.api.middleware:SSLMiddleware.factory diff --git a/service/files/backup.sh.j2 b/service/files/backup.sh.j2 deleted file mode 100644 index dc00a4d..0000000 --- a/service/files/backup.sh.j2 +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -ex -set -o pipefail -BACKUP_FILE_API="/var/ccp/backup/designate/backup-$(date "+%Y%m%d%H%M%S")-api.sql" -mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \ - -u {{ designate.db.username }} -p{{ designate.db.password }} \ - --single-transaction {{ designate.db.name.main_database }} > "${BACKUP_FILE_API}" -BACKUP_FILE_POOL="/var/ccp/backup/designate/backup-$(date "+%Y%m%d%H%M%S")-pool.sql" -mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address(service.database) }} \ - -u {{ designate.db.username }} -p{{ designate.db.password }} \ - --single-transaction {{ designate.db.name.pool_manager }} > "${BACKUP_FILE_POOL}" diff --git a/service/files/bind9-pools.yaml.j2 b/service/files/bind9-pools.yaml.j2 deleted file mode 100644 index 4f54280..0000000 --- a/service/files/bind9-pools.yaml.j2 +++ /dev/null @@ -1,27 +0,0 @@ ---- -- name: default - description: CCP BIND Pool - attributes: {} - - ns_records: - - hostname: ns.ccp.org. - priority: 1 - - nameservers: - - host: {{ network_topology["private"]["address"] }} - port: {{ designate.bind_port.cont }} - - targets: - - type: bind9 - description: BIND Instance - - masters: - - host: {{ network_topology["private"]["address"] }} - port: {{ designate.mdns_port.cont }} - - options: - host: {{ network_topology["private"]["address"] }} - port: {{ designate.bind_port.cont }} - rndc_host: {{ network_topology["private"]["address"] }} - rndc_port: {{ designate.rndc_port.cont }} - rndc_key_file: /etc/bind/rndc.key diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml deleted file mode 100644 index 34fbc1d..0000000 --- a/service/files/defaults.yaml +++ /dev/null @@ -1,62 +0,0 @@ -configs: - designate: - tls: - enabled: true - api_port: - cont: 9001 - ingress: dns - mdns_port: - cont: 5354 - rndc_port: - cont: 953 - bind_port: - cont: 53 - worker_port: - cont: 5358 - debug: true - notification: - driver: noop - topics: - enabled: false - names: changeme - backend: bind9 - # options, allows to configure services particularly - service: - central: - workers: 1 - threads: 1000 - api: - workers: 1 - threads: 1000 - mdns: - workers: 1 - threads: 1000 - agent: - workers: 1 - zone_manager: - workers: 1 - threads: 1000 - pool_manager: - workers: 1 - threads: 1000 - domain_purge: - interval: 3600 - batch_size: 100 - time_threshold: 604800 # 7 days - -secret_configs: - designate: - rndc_key_secret: fapwtRlIgYwYeQeyY3U1+Q== - username: designate - password: password - db: - username: designate - password: password - name: - pool_manager: designate_pool_manager - main_database: designate - -sources: - openstack/designate: - git_url: https://git.openstack.org/openstack/designate.git - git_ref: stable/newton diff --git a/service/files/designate.conf.j2 b/service/files/designate.conf.j2 deleted file mode 100644 index 5828137..0000000 --- a/service/files/designate.conf.j2 +++ /dev/null @@ -1,161 +0,0 @@ -######################## -## General Configuration -######################## - -[DEFAULT] -verbose = true -debug = {{ designate.debug }} -use_syslog = false -use_stderr = true - -notification_driver = {{ designate.notification.driver }} -{% if designate.notification.topics.enabled %} -notification_topics = {{ designate.notification.topics.names }} -{% endif %} - - -{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }} -{{ oslo_messaging[messaging.backend.rpc]('notifications_config') }} - -rabbit_userid = {{ rabbitmq.user }} -rabbit_password = {{ rabbitmq.password }} -rabbit_hosts = {{ address("rpc", rabbitmq.port) }} - -[oslo_messaging_rabbit] -rabbit_userid = {{ rabbitmq.user }} -rabbit_password = {{ rabbitmq.password }} -rabbit_hosts = {{ address("rpc", rabbitmq.port) }} - -#-------------------- -# Keystone Middleware -#-------------------- -{{ keystone_authtoken.keystone_authtoken(designate.username, designate.password) }} - -######################## -## Service Configuration -######################## -#---------------- -# Central Service -#---------------- -[service:central] -workers = {{ designate.service.central.workers }} -threads = {{ designate.service.central.threads }} - -#------------ -# API Service -#------------ -[service:api] -workers = {{ designate.service.api.workers }} -threads = {{ designate.service.api.threads }} -{% if designate.tls.enabled %} -api_base_uri = {{ address('designate-api', designate.api_port, with_scheme=True) }} -api_host = 127.0.0.1 -{% else %} -api_base_uri = http://{{ network_topology["private"]["address"] }}:{{ designate.api_port.cont }}/ -api_host = {{ network_topology["private"]["address"] }} -{% endif %} -api_port = {{ designate.api_port.cont }} -auth_strategy = keystone -enable_api_v1 = True -enabled_extensions_v1 = diagnostics, quotas, reports, sync, touch -enable_api_v2 = True -enabled_extensions_v2 = quotas, reports -enable_api_admin = True -#listen = {{ network_topology["private"]["address"] }}:{{ designate.api_port.cont }} - -{% if designate.tls.enabled %} -[network_api:neutron] -ca_certificates_file = /opt/ccp/etc/tls/ca.pem -{% endif %} - -#------------- -# Sink Service -#------------- -[service:sink] -enabled_notification_handlers = nova_fixed, neutron_floatingip - -#------------- -# mDNS Service -#------------- -[service:mdns] -workers = {{ designate.service.mdns.workers }} -threads = {{ designate.service.mdns.threads }} -all_tcp = True - -#-------------- -# Agent Service -#-------------- -[service:agent] -workers = {{ designate.service.agent.workers }} - -[service:worker] -enabled = True -notify = True - -#--------------------- -# Zone Manager Service -#--------------------- -[service:zone_manager] -workers = {{ designate.service.zone_manager.workers }} -threads = {{ designate.service.zone_manager.threads }} - -#------------------------ -# Deleted domains purging -#------------------------ -[zone_manager_task:domain_purge] -interval = {{ designate.domain_purge.interval }} -batch_size = {{ designate.domain_purge.batch_size }} -time_threshold = {{ designate.domain_purge.time_threshold }} - -#--------------------- -# Pool Manager Service -#--------------------- -[service:pool_manager] -workers = {{ designate.service.pool_manager.workers }} -threads = {{ designate.service.pool_manager.threads }} -{% if designate.pool is defined %} -pool_id = {{ designate.pool.pool_id }} -{%- endif %} -periodic_sync_interval = 1800 -periodic_recovery_interval = 120 - - -################################### -## Pool Manager Cache Configuration -################################### -#------------------------------ -# SQLAlchemy Pool Manager Cache -#------------------------------ -[pool_manager_cache:sqlalchemy] -connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address("database") }}/{{ designate.db.name.pool_manager }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} - -######################## -## Storage Configuration -######################## -#------------------- -# SQLAlchemy Storage -#------------------- -[storage:sqlalchemy] -connection = mysql+pymysql://{{ designate.db.username }}:{{ designate.db.password }}@{{ address("database") }}/{{ designate.db.name.main_database }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} - -######################## -## Handler Configuration -######################## -#------------------- -# Nova Fixed Handler -#------------------- -[handler:nova_fixed] -domain_id = default -notification_topics = notifications -control_exchange = 'neutron' -format = '%(hostname)s.%(domain)s' - -#------------------------- -# Neutron Floating Handler -#------------------------- -[handler:neutron_floatingip] -domain_id = default -notification_topics = notifications -control_exchange = 'neutron' -format = '%(hostname)s.%(domain)s' - diff --git a/service/files/named.conf.j2 b/service/files/named.conf.j2 deleted file mode 100644 index e86169a..0000000 --- a/service/files/named.conf.j2 +++ /dev/null @@ -1,12 +0,0 @@ -include "/etc/bind/named.conf.options"; -include "/etc/bind/named.conf.local"; -include "/etc/bind/named.conf.default-zones"; -include "/etc/bind/rndc.key"; - -controls { - inet * port {{ designate.rndc_port.cont }} - allow { any; } keys { "rndc-key"; }; - inet * port {{ designate.bind_port.cont }} - allow { any; } keys { "rndc-key"; }; -}; - diff --git a/service/files/named.conf.options.j2 b/service/files/named.conf.options.j2 deleted file mode 100644 index 21c8995..0000000 --- a/service/files/named.conf.options.j2 +++ /dev/null @@ -1,39 +0,0 @@ -options { - directory "/var/cache/bind"; - - // If there is a firewall between you and nameservers you want - // to talk to, you may need to fix the firewall to allow multiple - // ports to talk. See http://www.kb.cert.org/vuls/id/800113 - - // If your ISP provided one or more IP addresses for stable - // nameservers, you probably want to use them as forwarders. - // Uncomment the following block, and insert the addresses replacing - // the all-0's placeholder. - - // forwarders { - // 0.0.0.0; - // }; - - //======================================================================== - // If BIND logs error messages about the root key being expired, - // you will need to update your keys. See https://www.isc.org/bind-keys - //======================================================================== - dnssec-validation yes; - dnssec-enable yes; - auth-nxdomain no; # conform to RFC1035 - allow-new-zones yes; - request-ixfr no; - recursion no; - query-source address * port {{ designate.bind_port.cont }}; - listen-on { any; }; - listen-on-v6 { ipv-6-address; }; - allow-query { - any; - 10.233.0.0/16; - }; - allow-notify { - any; - 10.233.0.0/16; - }; -}; - diff --git a/service/files/nginx-api.conf.j2 b/service/files/nginx-api.conf.j2 deleted file mode 100644 index 1e30a78..0000000 --- a/service/files/nginx-api.conf.j2 +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen {{ network_topology["private"]["address"] }}:{{ designate.api_port.cont }} ssl; - include common/ssl.conf; - - location / { - proxy_pass http://designate_api; - include common/proxy-headers.conf; - } -} diff --git a/service/files/pools.yaml.j2 b/service/files/pools.yaml.j2 deleted file mode 100644 index 2500b99..0000000 --- a/service/files/pools.yaml.j2 +++ /dev/null @@ -1,11 +0,0 @@ -- name: default - description: CCP Fake Pool - attributes: {} - - ns_records: - - hostname: {{ network_topology['private']['address'] }} - priority: 1 - - targets: - - type: fake - description: Fake Backend \ No newline at end of file diff --git a/service/files/rndc.conf.j2 b/service/files/rndc.conf.j2 deleted file mode 100644 index da3fd01..0000000 --- a/service/files/rndc.conf.j2 +++ /dev/null @@ -1,8 +0,0 @@ -include "/etc/bind/rndc.key"; - -options { - default-key "rndc-key"; - default-server {{ network_topology["private"]["address"] }}; - default-port {{ designate.rndc_port.cont }}; -}; - diff --git a/service/files/rndc.key.j2 b/service/files/rndc.key.j2 deleted file mode 100644 index a598ae1..0000000 --- a/service/files/rndc.key.j2 +++ /dev/null @@ -1,4 +0,0 @@ -key "rndc-key" { - algorithm hmac-md5; - secret "{{ designate.rndc_key_secret }}"; -}; diff --git a/service/files/server-cert.pem.j2 b/service/files/server-cert.pem.j2 deleted file mode 100644 index 8abc152..0000000 --- a/service/files/server-cert.pem.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ security.tls.server_cert }} diff --git a/service/files/server-key.pem.j2 b/service/files/server-key.pem.j2 deleted file mode 100644 index 70cf751..0000000 --- a/service/files/server-key.pem.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ security.tls.server_key }} diff --git a/service/files/upstreams.conf.j2 b/service/files/upstreams.conf.j2 deleted file mode 100644 index a653248..0000000 --- a/service/files/upstreams.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -upstream designate_api { - server 127.0.0.1:{{ designate.api_port.cont }}; -} diff --git a/service/upgrade/default.yaml b/service/upgrade/default.yaml deleted file mode 100644 index 447886d..0000000 --- a/service/upgrade/default.yaml +++ /dev/null @@ -1,56 +0,0 @@ -upgrade: - name: upgrade-designate - image: designate-upgrade - steps: - - name: backup - command: /opt/ccp/bin/backup.sh - files: - - backup-sh - volumes: - - name: backup-dir - path: /var/ccp/backup/designate - type: host - readOnly: false - topology_key: backup - - name: kill-services - type: kill-services - - name: designate-api-syncdb - files: - - designate-conf - type: single - command: designate-manage --config-file /etc/designate/designate.conf database sync - - name: start-designate-central - type: rolling-upgrade - services: - - designate-api - - designate-central - - name: designate-pool-update - files: - - pools - - designate-conf - type: single - command: designate-manage pool update --file /etc/designate/pools.yaml - - name: designate-pool-sync - dependencies: - - designate-pool-manager-db-create - files: - - designate-conf - type: single - command: designate-manage --config-file /etc/designate/designate.conf pool-manager-cache sync - - name: start-other-services - type: rolling-upgrade - services: - - designate-pool-manager - - designate-mdns - - designate-zone-manager -files: - designate-conf: - path: /etc/designate/designate.conf - content: designate.conf.j2 - pools: - path: /etc/designate/pools.yaml - content: pools.yaml.j2 - backup-sh: - path: /opt/ccp/bin/backup.sh - content: backup.sh.j2 - perm: "500" diff --git a/tools/yamllint.sh b/tools/yamllint.sh deleted file mode 100755 index 0929f77..0000000 --- a/tools/yamllint.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -ex - -workdir=$(dirname $0) -finder=$(find . -not -path '*/\.*' -type f -name '*.yaml') -yamllint -c $workdir/yamllint.yaml $finder diff --git a/tools/yamllint.yaml b/tools/yamllint.yaml deleted file mode 100644 index e72baa4..0000000 --- a/tools/yamllint.yaml +++ /dev/null @@ -1,21 +0,0 @@ -extends: default - -rules: - braces: - max-spaces-inside: 1 - comments: - level: error - comments-indentation: - level: warning - document-end: - present: false - document-start: - level: error - present: false - empty-lines: - max: 1 - max-start: 0 - max-end: 0 - line-length: - level: warning - max: 120 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 3c1338c..0000000 --- a/tox.ini +++ /dev/null @@ -1,17 +0,0 @@ -[tox] -minversion = 1.6 -envlist = linters,bashate -skipsdist = True - -[testenv:venv] -commands = {posargs} - -[testenv:linters] -deps = yamllint -commands = - {toxinidir}/tools/yamllint.sh - -[testenv:bashate] -deps = bashate>=0.2 -whitelist_externals = bash -commands = bash -c "find {toxinidir} -type f -name '*.sh' -not -path '*/.tox/*' -print0 | xargs -0 bashate -v"