diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 172bf57..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.tox diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 68c771a..0000000 --- a/LICENSE +++ /dev/null @@ -1,176 +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/glance-api/Dockerfile.j2 b/docker/glance-api/Dockerfile.j2 deleted file mode 100644 index b80a17b..0000000 --- a/docker/glance-api/Dockerfile.j2 +++ /dev/null @@ -1,19 +0,0 @@ -FROM {{ image_spec("glance-base") }} -MAINTAINER {{ maintainer }} - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - mysql-client \ - && apt-get install -y --no-install-recommends -t jessie-backports \ - ceph-common \ - python-ceph \ - python-rados \ - && apt-get clean \ - && mkdir -p /etc/ceph \ - && chown -R glance: /etc/ceph \ - && ln -s /usr/lib/python2.7/dist-packages/rados.x86_64-linux-gnu.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados.x86_64-linux-gnu.so \ - && ln -s /usr/lib/python2.7/dist-packages/rados-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rados-0.egg-info \ - && ln -s /usr/lib/python2.7/dist-packages/rbd-0.egg-info /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd-0.egg-info \ - && ln -s /usr/lib/python2.7/dist-packages/rbd.x86_64-linux-gnu.so /var/lib/microservices/venv/local/lib/python2.7/site-packages/rbd.x86_64-linux-gnu.so - -USER glance diff --git a/docker/glance-base/Dockerfile.j2 b/docker/glance-base/Dockerfile.j2 deleted file mode 100644 index fdf850f..0000000 --- a/docker/glance-base/Dockerfile.j2 +++ /dev/null @@ -1,13 +0,0 @@ -FROM {{ image_spec("openstack-base") }} -MAINTAINER {{ maintainer }} - -COPY {{ render('sources.list.debian.j2') }} /etc/apt/sources.list.d/ceph.list -{{ copy_sources("openstack/glance", "/glance") }} - -RUN useradd --user-group -G microservices glance \ - && apt-key adv --recv-keys --keyserver {{ url.ceph.debian.keyserver }} \ - {{ url.ceph.debian.keyid }} \ - && /var/lib/microservices/venv/bin/pip install --upgrade /glance \ - && mkdir -p /var/lib/glance /etc/glance \ - && cp -r /glance/etc/* /etc/glance \ - && chown -R glance: /etc/glance /var/lib/glance diff --git a/docker/glance-base/sources.list.debian.j2 b/docker/glance-base/sources.list.debian.j2 deleted file mode 100644 index b3bb799..0000000 --- a/docker/glance-base/sources.list.debian.j2 +++ /dev/null @@ -1 +0,0 @@ -deb {{ url.ceph.debian.repo }} jessie main diff --git a/docker/glance-registry/Dockerfile.j2 b/docker/glance-registry/Dockerfile.j2 deleted file mode 100644 index 18d1851..0000000 --- a/docker/glance-registry/Dockerfile.j2 +++ /dev/null @@ -1,4 +0,0 @@ -FROM {{ image_spec("glance-base") }} -MAINTAINER {{ maintainer }} - -USER glance diff --git a/docker/glance-upgrade/Dockerfile.j2 b/docker/glance-upgrade/Dockerfile.j2 deleted file mode 100644 index 7ae2ccb..0000000 --- a/docker/glance-upgrade/Dockerfile.j2 +++ /dev/null @@ -1,5 +0,0 @@ -FROM {{ image_spec("glance-base") }} -MAINTAINER {{ maintainer }} - -RUN apt-get install -y --no-install-recommends mysql-client \ - && apt-get clean diff --git a/service/actions/db-sync.yaml b/service/actions/db-sync.yaml deleted file mode 100644 index 326ccb6..0000000 --- a/service/actions/db-sync.yaml +++ /dev/null @@ -1,9 +0,0 @@ -actions: - - name: glance-db-sync - image: glance-base - dependencies: - - glance-db-create - command: glance-manage db_sync - files: - - path: /etc/glance/glance-api.conf - content: glance-api.conf.j2 diff --git a/service/files/backup.sh.j2 b/service/files/backup.sh.j2 deleted file mode 100644 index 958aa5a..0000000 --- a/service/files/backup.sh.j2 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -ex -set -o pipefail -BACKUP_FILE="/var/ccp/backup/glance/backup-$(date "+%Y%m%d%H%M%S").sql" -mysqldump {% if db.tls.enabled %} --ssl-mode REQUIRED {% endif %} -h {{ address("database") }} \ - -u {{ glance.db.username }} -p{{ glance.db.password }} \ - --single-transaction {{ glance.db.name }} > "${BACKUP_FILE}" diff --git a/service/files/ca-cert.pem.j2 b/service/files/ca-cert.pem.j2 deleted file mode 100644 index d52069b..0000000 --- a/service/files/ca-cert.pem.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ security.tls.ca_cert }} diff --git a/service/files/ceph.client.glance.keyring.j2 b/service/files/ceph.client.glance.keyring.j2 deleted file mode 100644 index 44d4d69..0000000 --- a/service/files/ceph.client.glance.keyring.j2 +++ /dev/null @@ -1,3 +0,0 @@ -[client.{{ glance.ceph.username }}] -key = {{ glance.ceph.key }} - diff --git a/service/files/ceph.conf.j2 b/service/files/ceph.conf.j2 deleted file mode 100644 index d5edaad..0000000 --- a/service/files/ceph.conf.j2 +++ /dev/null @@ -1,7 +0,0 @@ -[global] -fsid = {{ ceph.fsid }} -mon_host = {{ ceph.mon_host }} -auth_cluster_required = cephx -auth_service_required = cephx -auth_client_required = cephx - diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml deleted file mode 100644 index b89d2dc..0000000 --- a/service/files/defaults.yaml +++ /dev/null @@ -1,45 +0,0 @@ -configs: - glance: - tls: - enabled: true - api_port: - cont: 9292 - ingress: image - registry_port: - cont: 9191 - - debug: false - - ceph: - enable: false - - swift: - enable: false - store_create_container_on_put: true - store_container: glance - store_auth_insecure: false - - bootstrap: - enable: false - image: - url: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img - disk_format: qcow2 - name: cirros - -secret_configs: - glance: - db: - username: glance - password: password - name: glance - user: glance - password: password - ceph: - key: "Changeme" - username: "glance" - pool_name: "images" - -sources: - openstack/glance: - git_url: https://git.openstack.org/openstack/glance.git - git_ref: stable/newton diff --git a/service/files/glance-api.conf.j2 b/service/files/glance-api.conf.j2 deleted file mode 100644 index ac2dcbd..0000000 --- a/service/files/glance-api.conf.j2 +++ /dev/null @@ -1,73 +0,0 @@ -[DEFAULT] -debug = {{ glance.debug }} - -use_syslog = false -use_stderr = true -use_forwarded_for = true - -{% if glance.tls.enabled %} -registry_client_protocol = https -registry_client_ca_file = /opt/ccp/etc/tls/ca.pem -bind_host = 127.0.0.1 -{% else %} -bind_host = {{ network_topology["private"]["address"] }} -{% endif %} -bind_port = {{ glance.api_port.cont }} - -registry_host = glance-registry -{% if glance.ceph.enable %} -show_image_direct_url = true -{% endif %} - -show_multiple_locations = true - -[database] -connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address("database") }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} -max_retries = -1 - -{{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }} - -[paste_deploy] -flavor = keystone - -[glance_store] -{% if glance.ceph.enable %} -stores = http,rbd -default_store = rbd -rbd_store_pool = {{ glance.ceph.pool_name }} -rbd_store_user = {{ glance.ceph.username }} -rbd_store_ceph_conf = /etc/ceph/ceph.conf -{% elif glance.swift.enable %} -stores = http,swift -default_store = swift -swift_store_multi_tenant = True -swift_store_create_container_on_put = {{ glance.swift.store_create_container_on_put }} -swift_store_region = RegionOne -default_swift_reference = swift -swift_store_container = {{ glance.swift.store_container }} -swift_store_config_file = /etc/glance/glance-swift-store.conf -swift_store_auth_insecure = {{ glance.swift.store_auth_insecure }} -{% if security.tls.create_certificates %} -swift_store_cacert = /opt/ccp/etc/tls/ca.pem -{% endif %} -{% else %} -stores = http,file -default_store = file -filesystem_store_datadir = /var/lib/glance/images/ -{% endif %} - -{% if glance.ceph.enable %} -[image_format] -container_formats = bare -disk_formats = raw -{% endif %} - -{% if searchlight is defined and searchlight.services.glance -%} -[oslo_messaging_notifications] -driver = {{ searchlight.notification_driver }} -{%- endif %} - - -{# rpc config is required for notifications in stable/mitaka #} -{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }} -{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }} diff --git a/service/files/glance-cirros-image-upload.sh.j2 b/service/files/glance-cirros-image-upload.sh.j2 deleted file mode 100644 index 79a9706..0000000 --- a/service/files/glance-cirros-image-upload.sh.j2 +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -set -ex - -export OS_IDENTITY_API_VERSION=3 -export OS_INTERFACE="internal" -export OS_PROJECT_DOMAIN_NAME=default -export OS_USER_DOMAIN_NAME=default -export OS_PASSWORD={{ openstack.user_password }} -export OS_USERNAME={{ openstack.user_name }} -export OS_PROJECT_NAME={{ openstack.project_name }} -export OS_AUTH_URL="{{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3" -{% if security.tls.create_certificates %} -export OS_CACERT="/opt/ccp/etc/tls/ca.pem" -{% endif %} - -{% set image = glance.bootstrap.image %} -FILE="$(mktemp)" -curl {{ image.url }} -o "${FILE}" -openstack image create --public --disk-format {{ image.disk_format }} --file "${FILE}" {{ image.name }} -rm "${FILE}" diff --git a/service/files/glance-registry.conf.j2 b/service/files/glance-registry.conf.j2 deleted file mode 100644 index 0bc5c48..0000000 --- a/service/files/glance-registry.conf.j2 +++ /dev/null @@ -1,31 +0,0 @@ -[DEFAULT] -debug = {{ glance.debug }} - -use_syslog = false -use_stderr = true -use_forwarded_for = true - -{% if glance.tls.enabled %} -bind_host = 127.0.0.1 -{% else %} -bind_host = {{ network_topology["private"]["address"] }} -{% endif %} -bind_port = {{ glance.registry_port.cont }} - -[database] -connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{{ address("database") }}/{{ glance.db.name }}{% if db.tls.enabled %}?ssl_ca=/opt/ccp/etc/tls/ca.pem{% endif %} -max_retries = -1 - -{{ keystone_authtoken.keystone_authtoken(glance.user, glance.password) }} - -[paste_deploy] -flavor = keystone - -{% if searchlight is defined and searchlight.services.glance -%} -[oslo_messaging_notifications] -driver = {{ searchlight.notification_driver }} -{%- endif %} - -{# rpc config is required for notifications in stable/mitaka #} -{{ oslo_messaging[messaging.backend.rpc]('rpc_config') }} -{{ oslo_messaging[messaging.backend.notifications]('notifications_config') }} diff --git a/service/files/glance-swift-store.conf.j2 b/service/files/glance-swift-store.conf.j2 deleted file mode 100644 index d6cfb8a..0000000 --- a/service/files/glance-swift-store.conf.j2 +++ /dev/null @@ -1,7 +0,0 @@ -[swift] -auth_version = 3 -auth_address = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3 -user = service:{{ glance.user }} -key = {{ glance.password }} -project_domain_id = default -user_domain_id = default diff --git a/service/files/nginx-api.conf.j2 b/service/files/nginx-api.conf.j2 deleted file mode 100644 index 0ab1b28..0000000 --- a/service/files/nginx-api.conf.j2 +++ /dev/null @@ -1,11 +0,0 @@ -server { - listen {{ network_topology["private"]["address"] }}:{{ glance.api_port.cont }} ssl; - include common/ssl.conf; - # allows to upload images without being cut off at some low size - client_max_body_size 0; - - location / { - proxy_pass http://glance_api; - include common/proxy-headers.conf; - } -} diff --git a/service/files/nginx-registry.conf.j2 b/service/files/nginx-registry.conf.j2 deleted file mode 100644 index 7fe1a77..0000000 --- a/service/files/nginx-registry.conf.j2 +++ /dev/null @@ -1,11 +0,0 @@ -server { - listen {{ network_topology["private"]["address"] }}:{{ glance.registry_port.cont }} ssl; - include common/ssl.conf; - # allows to upload images without being cut off at some low size - client_max_body_size 0; - - location / { - proxy_pass http://glance_registry; - include common/proxy-headers.conf; - } -} 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 716a515..0000000 --- a/service/files/upstreams.conf.j2 +++ /dev/null @@ -1,6 +0,0 @@ -upstream glance_api { - server 127.0.0.1:{{ glance.api_port.cont }}; -} -upstream glance_registry { - server 127.0.0.1:{{ glance.registry_port.cont }}; -} diff --git a/service/glance-api.yaml b/service/glance-api.yaml deleted file mode 100644 index ef205c4..0000000 --- a/service/glance-api.yaml +++ /dev/null @@ -1,134 +0,0 @@ -dsl_version: 0.4.0 -service: - name: glance-api - ports: - - {{ glance.api_port }} - annotations: - service: - prometheus.io/probe: "true" - prometheus.io/probe_path: "/healthcheck" - containers: - - name: glance-api - image: glance-api - pre: - - name: glance-db-create - dependencies: - - database - type: single - command: - mysql -u root -p{{ db.root_password }} -h {{ address("database") }} -e "create database {{ glance.db.name }}; - create user '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}' - {% if db.tls.enabled %} require ssl {% endif %}; - grant all privileges on {{ glance.db.name }}.* to '{{ glance.db.username }}'@'%' identified by '{{ glance.db.password }}' - {% if db.tls.enabled %} require ssl {% endif %};" - - name: glance-db-sync - files: - - glance-api - dependencies: - - glance-db-create - type: single - command: glance-manage db_sync - - name: glance-user-create - dependencies: - - keystone-create-domain - type: single - command: openstack user create --domain {{ service_account.domain }} --password {{ glance.password }} {{ glance.user }} - - name: glance-role-add - dependencies: - - glance-user-create - type: single - command: openstack role add --project {{ service_account.project }} --user {{ glance.user }} admin - - name: glance-service-create - dependencies: - - keystone - type: single - command: openstack service create --name glance --description "OpenStack Image service" image - - name: glance-public-endpoint-create - dependencies: - - glance-service-create - type: single - command: openstack endpoint create --region RegionOne image public {{ address('glance-api', glance.api_port, external=True, with_scheme=True) }} - - name: glance-internal-endpoint-create - dependencies: - - glance-service-create - type: single - command: openstack endpoint create --region RegionOne image internal {{ address('glance-api', glance.api_port, with_scheme=True) }} - - name: glance-admin-endpoint-create - dependencies: - - glance-service-create - type: single - command: openstack endpoint create --region RegionOne image admin {{ address('glance-api', glance.api_port, with_scheme=True) }} - daemon: - files: - - glance-api - # {% if glance.tls.enabled %} - - ca_cert - # {% endif %} - # {% if glance.ceph.enable %} - - ceph-conf - - glance-ceph-key - # {% endif %} - # {% if glance.swift.enable %} - - glance-swift-conf - # {% endif %} - command: glance-api - dependencies: - - memcached - # {% if glance.bootstrap.enable %} - post: - - name: glance-cirros-image-upload - type: single - command: /opt/ccp/bin/glance-cirros-image-upload.sh - files: - - glance-cirros-image-upload.sh - # {% endif %} - # {% if glance.tls.enabled %} - - name: nginx-glance-api - image: nginx - daemon: - files: - - upstreams - - servers - - server-cert - - server-key - command: nginx - # {% endif %} - -files: - glance-api: - path: /etc/glance/glance-api.conf - content: glance-api.conf.j2 - ceph-conf: - path: /etc/ceph/ceph.conf - content: ceph.conf.j2 - glance-ceph-key: - path: /etc/ceph/ceph.client.{{ glance.ceph.username }}.keyring - content: ceph.client.glance.keyring.j2 - glance-swift-conf: - path: /etc/glance/glance-swift-store.conf - content: glance-swift-store.conf.j2 - glance-cirros-image-upload.sh: - path: /opt/ccp/bin/glance-cirros-image-upload.sh - content: glance-cirros-image-upload.sh.j2 - perm: "500" - # {% if glance.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" - ca_cert: - path: /opt/ccp/etc/tls/ca.pem - content: ca-cert.pem.j2 - 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/glance-registry.yaml b/service/glance-registry.yaml deleted file mode 100644 index d0a6d87..0000000 --- a/service/glance-registry.yaml +++ /dev/null @@ -1,58 +0,0 @@ -dsl_version: 0.4.0 -service: - name: glance-registry - ports: - - {{ glance.registry_port }} - annotations: - service: - prometheus.io/probe: "true" - prometheus.io/probe_path: "/healthcheck" - containers: - - name: glance-registry - image: glance-registry - daemon: - files: - - glance-registry-conf - # {% if glance.tls.enabled %} - - ca_cert - # {% endif %} - dependencies: - - glance-api - command: glance-registry - # {% if glance.tls.enabled %} - - name: nginx-glance-registry - image: nginx - daemon: - files: - - upstreams - - servers - - server-cert - - server-key - command: nginx - # {% endif %} - -files: - glance-registry-conf: - path: /etc/glance/glance-registry.conf - content: glance-registry.conf.j2 - # {% if glance.tls.enabled %} - servers: - path: /etc/nginx/conf.d/servers.conf - content: nginx-registry.conf.j2 - perm: "0400" - upstreams: - path: /etc/nginx/conf.d/upstreams.conf - content: upstreams.conf.j2 - perm: "0400" - ca_cert: - path: /opt/ccp/etc/tls/ca.pem - content: ca-cert.pem.j2 - 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/upgrade/default.yaml b/service/upgrade/default.yaml deleted file mode 100644 index 46866b2..0000000 --- a/service/upgrade/default.yaml +++ /dev/null @@ -1,30 +0,0 @@ -upgrade: - name: upgrade-glance - image: glance-upgrade - steps: - - name: backup - command: /opt/ccp/bin/backup.sh - files: - - backup-sh - volumes: - - name: backup-dir - path: /var/ccp/backup/glance - type: host - readOnly: false - topology_key: backup - - name: kill-services - type: kill-services - - name: db-sync - command: glance-manage db_sync - files: - - glance-conf - - name: start-services - type: rolling-upgrade -files: - glance-conf: - path: /etc/glance/glance-api.conf - content: glance-api.conf.j2 - backup-sh: - path: /opt/ccp/bin/backup.sh - content: backup.sh.j2 - perm: "500" diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index f4b690a..0000000 --- a/test-requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -yamllint>=1.3.2 -bashate>=0.2 diff --git a/tools/yamllint.sh b/tools/yamllint.sh deleted file mode 100755 index 6e84445..0000000 --- a/tools/yamllint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -ex - -workdir=$(dirname $0) -yamllint -c $workdir/yamllint.yaml $(find . -not -path '*/\.*' -type f -name '*.yaml') diff --git a/tools/yamllint.yaml b/tools/yamllint.yaml deleted file mode 100644 index 6c2e4a7..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: no - document-start: - level: error - present: no - 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 cec9f60..0000000 --- a/tox.ini +++ /dev/null @@ -1,18 +0,0 @@ -[tox] -minversion = 1.6 -envlist = linters,bashate -skipsdist = True - -[testenv] -deps = -r{toxinidir}/test-requirements.txt - -[testenv:linters] -commands = - {toxinidir}/tools/yamllint.sh - -[testenv:bashate] -whitelist_externals = bash -commands = bash -c "find {toxinidir} -type f -name '*.sh' -not -path '*/.tox/*' -print0 | xargs -0 bashate -v" - -[testenv:venv] -commands = {posargs}