Merge "Drop Freezer"

README.rst

@@ -48,7 +48,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `CloudKitty <https://docs.openstack.org/cloudkitty/latest/>`__
 - `Cyborg <https://docs.openstack.org/cyborg/latest/>`__
 - `Designate <https://docs.openstack.org/designate/latest/>`__
-- `Freezer <https://docs.openstack.org/freezer/latest/>`__
 - `Glance <https://docs.openstack.org/glance/latest/>`__
 - `Heat <https://docs.openstack.org/heat/latest/>`__
 - `Horizon <https://docs.openstack.org/horizon/latest/>`__

ansible/group_vars/all.yml

@@ -380,12 +380,6 @@ etcd_protocol: "{{ 'https' if etcd_enable_tls | bool else 'http' }}"
 
 fluentd_syslog_port: "5140"
 
-freezer_internal_fqdn: "{{ kolla_internal_fqdn }}"
-freezer_external_fqdn: "{{ kolla_external_fqdn }}"
-freezer_api_port: "9090"
-freezer_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else freezer_api_port }}"
-freezer_api_listen_port: "{{ freezer_api_port }}"
-
 glance_internal_fqdn: "{{ kolla_internal_fqdn }}"
 glance_external_fqdn: "{{ kolla_external_fqdn }}"
 glance_api_port: "9292"
@@ -808,7 +802,6 @@ enable_designate: "no"
 enable_etcd: "no"
 enable_fluentd: "yes"
 enable_fluentd_systemd: "{{ (enable_fluentd | bool) and (enable_central_logging | bool) }}"
-enable_freezer: "no"
 enable_gnocchi: "no"
 enable_gnocchi_statsd: "no"
 enable_grafana: "no"
@@ -819,7 +812,6 @@ enable_horizon: "{{ enable_openstack_core | bool }}"
 enable_horizon_blazar: "{{ enable_blazar | bool }}"
 enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}"
 enable_horizon_designate: "{{ enable_designate | bool }}"
-enable_horizon_freezer: "{{ enable_freezer | bool }}"
 enable_horizon_heat: "{{ enable_heat | bool }}"
 enable_horizon_ironic: "{{ enable_ironic | bool }}"
 enable_horizon_magnum: "{{ enable_magnum | bool }}"

ansible/inventory/all-in-one

@@ -91,9 +91,6 @@ control
 [cloudkitty:children]
 control
 
-[freezer:children]
-control
-
 [memcached:children]
 control
 
@@ -302,13 +299,6 @@ cloudkitty
 [cloudkitty-processor:children]
 cloudkitty
 
-# Freezer
-[freezer-api:children]
-freezer
-
-[freezer-scheduler:children]
-freezer
-
 # iSCSI
 [iscsid:children]
 compute

ansible/inventory/multinode

@@ -115,9 +115,6 @@ control
 [cloudkitty:children]
 control
 
-[freezer:children]
-control
-
 [memcached:children]
 control
 
@@ -321,13 +318,6 @@ cloudkitty
 [cloudkitty-processor:children]
 cloudkitty
 
-# Freezer
-[freezer-api:children]
-freezer
-
-[freezer-scheduler:children]
-freezer
-
 # iSCSI
 [iscsid:children]
 compute

ansible/roles/common/defaults/main.yml

@@ -152,8 +152,6 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_cyborg | bool }}"
   - name: designate
     enabled: "{{ enable_designate | bool }}"
-  - name: freezer
-    enabled: "{{ enable_freezer | bool }}"
   - name: glance
     enabled: "{{ enable_glance | bool }}"
   - name: gnocchi

ansible/roles/common/tasks/config.yml

@@ -222,7 +222,6 @@
       - { name: "designate", enabled: "{{ enable_designate | bool }}" }
       - { name: "etcd", enabled: "{{ enable_etcd | bool }}" }
       - { name: "fluentd", enabled: "{{ enable_fluentd | bool }}" }
-      - { name: "freezer", enabled: "{{ enable_freezer | bool }}" }
       - { name: "glance", enabled: "{{ enable_glance | bool }}" }
       - { name: "glance-tls-proxy", enabled: "{{ glance_enable_tls_backend | bool }}" }
       - { name: "gnocchi", enabled: "{{ enable_gnocchi | bool }}" }

ansible/roles/common/templates/conf/filter/01-rewrite.conf.j2

@@ -111,11 +111,6 @@
     pattern ^(watcher-api|watcher-applier|watcher-db-manage|watcher-decision-engine)$
     tag openstack_python
   </rule>
-  <rule>
-    key     programname
-    pattern ^(freezer-api|freezer-api_access|freezer-manage)$
-    tag openstack_python
-  </rule>
   <rule>
     key     programname
     pattern ^(octavia-api|octavia-health-manager|octavia-housekeeping|octavia-worker)$

ansible/roles/common/templates/cron-logrotate-freezer.conf.j2

@@ -1,3 +0,0 @@
-"/var/log/kolla/freezer/*.log"
-{
-}

ansible/roles/freezer/defaults/main.yml

@@ -1,138 +0,0 @@
----
-freezer_services:
-  freezer-api:
-    container_name: freezer_api
-    group: freezer-api
-    enabled: true
-    image: "{{ freezer_api_image_full }}"
-    volumes: "{{ freezer_api_default_volumes + freezer_api_extra_volumes }}"
-    dimensions: "{{ freezer_api_dimensions }}"
-    haproxy:
-      freezer_api:
-        enabled: "{{ enable_freezer }}"
-        mode: "http"
-        external: false
-        port: "{{ freezer_api_port }}"
-        listen_port: "{{ freezer_api_listen_port }}"
-      freezer_api_external:
-        enabled: "{{ enable_freezer }}"
-        mode: "http"
-        external: true
-        external_fqdn: "{{ freezer_external_fqdn }}"
-        port: "{{ freezer_api_public_port }}"
-        listen_port: "{{ freezer_api_listen_port }}"
-  freezer-scheduler:
-    container_name: freezer_scheduler
-    group: freezer-scheduler
-    enabled: true
-    image: "{{ freezer_scheduler_image_full }}"
-    volumes: "{{ freezer_scheduler_default_volumes + freezer_scheduler_extra_volumes }}"
-    dimensions: "{{ freezer_scheduler_dimensions }}"
-
-####################
-# Config Validate
-####################
-freezer_config_validation:
-  - generator: "/freezer/etc/config-generator.conf"
-    config: "/etc/freezer/freezer.conf"
-
-####################
-## Database
-#####################
-freezer_database_backend: "mariadb"
-freezer_database_name: "freezer"
-freezer_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}freezer{% endif %}"
-freezer_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}"
-freezer_elasticsearch_replicas: "1"
-freezer_es_protocol: "{{ internal_protocol }}"
-freezer_es_address: "{{ opensearch_address }}"
-freezer_es_port: "{{ opensearch_port }}"
-
-####################
-# Database sharding
-####################
-freezer_database_shard_root_user: "{% if enable_proxysql | bool %}root_shard_{{ freezer_database_shard_id }}{% else %}{{ database_user }}{% endif %}"
-freezer_database_shard_id: "{{ mariadb_default_database_shard_id | int }}"
-freezer_database_shard:
-  users:
-    - user: "{{ freezer_database_user }}"
-      password: "{{ freezer_database_password }}"
-  rules:
-    - schema: "{{ freezer_database_name }}"
-      shard_id: "{{ freezer_database_shard_id }}"
-
-
-####################
-# Docker
-####################
-freezer_tag: "{{ openstack_tag }}"
-
-freezer_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/freezer-api"
-freezer_api_tag: "{{ freezer_tag }}"
-freezer_api_image_full: "{{ freezer_api_image }}:{{ freezer_api_tag }}"
-
-freezer_scheduler_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/freezer-scheduler"
-freezer_scheduler_tag: "{{ freezer_tag }}"
-freezer_scheduler_image_full: "{{ freezer_scheduler_image }}:{{ freezer_scheduler_tag }}"
-
-freezer_api_dimensions: "{{ default_container_dimensions }}"
-freezer_scheduler_dimensions: "{{ default_container_dimensions }}"
-
-freezer_api_default_volumes:
-  - "{{ node_config_directory }}/freezer-api/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "freezer:/var/lib/freezer/"
-  - "kolla_logs:/var/log/kolla/"
-  - "{{ kolla_dev_repos_directory ~ '/freezer-api/freezer_api:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/freezer_api' if freezer_dev_mode | bool else '' }}"
-freezer_scheduler_default_volumes:
-  - "{{ node_config_directory }}/freezer-scheduler/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
-  - "freezer:/var/lib/freezer/"
-  - "kolla_logs:/var/log/kolla/"
-  - "{{ kolla_dev_repos_directory ~ '/freezer/freezer:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/freezer' if freezer_dev_mode | bool else '' }}"
-
-freezer_extra_volumes: "{{ default_extra_volumes }}"
-freezer_api_extra_volumes: "{{ freezer_extra_volumes }}"
-freezer_scheduler_extra_volumes: "{{ freezer_extra_volumes }}"
-
-####################
-# OpenStack
-####################
-freezer_internal_endpoint: "{{ freezer_internal_fqdn | kolla_url(internal_protocol, freezer_api_port) }}"
-freezer_public_endpoint: "{{ freezer_external_fqdn | kolla_url(public_protocol, freezer_api_public_port) }}"
-
-freezer_logging_debug: "{{ openstack_logging_debug }}"
-
-freezer_keystone_user: "freezer"
-
-openstack_freezer_auth: "{{ openstack_auth }}"
-
-freezer_api_workers: "{{ openstack_service_workers }}"
-
-####################
-# Kolla
-####################
-freezer_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
-freezer_api_git_repository: "{{ kolla_dev_repos_git }}/freezer-api"
-freezer_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
-freezer_dev_mode: "{{ kolla_dev_mode }}"
-freezer_source_version: "{{ kolla_source_version }}"
-
-####################
-# Keystone
-####################
-freezer_ks_services:
-  - name: "freezer"
-    type: "backup"
-    description: "Openstack Freezer Backup Service"
-    endpoints:
-      - {'interface': 'internal', 'url': '{{ freezer_internal_endpoint }}'}
-      - {'interface': 'public', 'url': '{{ freezer_public_endpoint }}'}
-
-freezer_ks_users:
-  - project: "service"
-    user: "{{ freezer_keystone_user }}"
-    password: "{{ freezer_keystone_password }}"
-    role: "admin"

ansible/roles/freezer/handlers/main.yml

@@ -1,30 +0,0 @@
----
-- name: Restart freezer-api container
-  vars:
-    service_name: "freezer-api"
-    service: "{{ freezer_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    volumes: "{{ service.volumes }}"
-    dimensions: "{{ service.dimensions }}"
-  when:
-    - kolla_action != "config"
-
-- name: Restart freezer-scheduler container
-  vars:
-    service_name: "freezer-scheduler"
-    service: "{{ freezer_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    volumes: "{{ service.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ service.dimensions }}"
-  when:
-    - kolla_action != "config"

ansible/roles/freezer/tasks/bootstrap.yml

@@ -1,40 +0,0 @@
----
-- name: Creating Freezer database
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: mysql_db
-    module_args:
-      login_host: "{{ database_address }}"
-      login_port: "{{ database_port }}"
-      login_user: "{{ freezer_database_shard_root_user }}"
-      login_password: "{{ database_password }}"
-      name: "{{ freezer_database_name }}"
-  become: true
-  run_once: True
-  delegate_to: "{{ groups['freezer-api'][0] }}"
-  when:
-    - freezer_database_backend == 'mariadb'
-    - not use_preconfigured_databases | bool
-
-- name: Creating Freezer database user and setting permissions
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: mysql_user
-    module_args:
-      login_host: "{{ database_address }}"
-      login_port: "{{ database_port }}"
-      login_user: "{{ freezer_database_shard_root_user }}"
-      login_password: "{{ database_password }}"
-      name: "{{ freezer_database_user }}"
-      password: "{{ freezer_database_password }}"
-      host: "%"
-      priv: "{{ freezer_database_name }}.*:ALL"
-      append_privs: "yes"
-  become: true
-  run_once: True
-  delegate_to: "{{ groups['freezer-api'][0] }}"
-  when:
-    - freezer_database_backend == 'mariadb'
-    - not use_preconfigured_databases | bool
-
-- import_tasks: bootstrap_service.yml

ansible/roles/freezer/tasks/bootstrap_service.yml

@@ -1,20 +0,0 @@
----
-- name: Running Freezer bootstrap container
-  vars:
-    freezer_api: "{{ freezer_services['freezer-api'] }}"
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ freezer_api.image }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_freezer"
-    restart_policy: oneshot
-    volumes: "{{ freezer_api.volumes | reject('equalto', '') | list }}"
-  run_once: True
-  delegate_to: "{{ groups[freezer_api.group][0] }}"

ansible/roles/freezer/tasks/check-containers.yml

@@ -1,16 +0,0 @@
----
-- name: Check freezer containers
-  become: true
-  kolla_container:
-    action: "compare_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ item.value.container_name }}"
-    image: "{{ item.value.image }}"
-    volumes: "{{ item.value.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ freezer_services }}"
-  notify:
-    - "Restart {{ item.key }} container"

ansible/roles/freezer/tasks/check.yml

@@ -1 +0,0 @@
----

ansible/roles/freezer/tasks/clone.yml

@@ -1,16 +0,0 @@
----
-- name: Cloning freezer source repository for development
-  become: true
-  git:
-    repo: "{{ freezer_git_repository }}"
-    dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
-    update: "{{ freezer_dev_repos_pull }}"
-    version: "{{ freezer_source_version }}"
-
-- name: Cloning freezer-api source repository for development
-  become: true
-  git:
-    repo: "{{ freezer_api_git_repository }}"
-    dest: "{{ kolla_dev_repos_directory }}/freezer-api"
-    update: "{{ freezer_dev_repos_pull }}"
-    version: "{{ freezer_source_version }}"

ansible/roles/freezer/tasks/config.yml

@@ -1,97 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item.key }}"
-    state: "directory"
-    owner: "{{ config_owner_user }}"
-    group: "{{ config_owner_group }}"
-    mode: "0770"
-  become: true
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ freezer_services }}"
-
-- name: Check if policies shall be overwritten
-  stat:
-    path: "{{ item }}"
-  delegate_to: localhost
-  run_once: True
-  register: freezer_policy
-  with_first_found:
-    - files: "{{ supported_policy_format_list }}"
-      paths:
-        - "{{ node_custom_config }}/freezer/"
-      skip: true
-
-- name: Set freezer policy file
-  set_fact:
-    freezer_policy_file: "{{ freezer_policy.results.0.stat.path | basename }}"
-    freezer_policy_file_path: "{{ freezer_policy.results.0.stat.path }}"
-  when:
-    - freezer_policy.results
-
-- include_tasks: copy-certs.yml
-  when:
-    - kolla_copy_ca_into_containers | bool
-
-- name: Copying over config.json files for services
-  template:
-    src: "{{ item.key }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
-    mode: "0660"
-  become: true
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ freezer_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
-
-- name: Copying over wsgi-freezer-api.conf
-  vars:
-    service: "{{ freezer_services['freezer-api'] }}"
-  template:
-    src: "wsgi-freezer-api.conf.j2"
-    dest: "{{ node_config_directory }}/freezer-api/wsgi-freezer-api.conf"
-    mode: "0660"
-  become: true
-  when:
-    - inventory_hostname in groups[service.group]
-    - service.enabled | bool
-  notify:
-    - Restart freezer-api container
-
-- name: Copying over freezer confs
-  vars:
-    service_name: "{{ item.key }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/freezer.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/freezer.conf"
-      - "{{ node_custom_config }}/freezer/{{ item.key }}.conf"
-      - "{{ node_custom_config }}/freezer/{{ inventory_hostname }}/{{ item.key }}.conf"
-    dest: "{{ node_config_directory }}/{{ item.key }}/freezer.conf"
-    mode: "0660"
-  become: true
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ freezer_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
-
-- name: Copying over existing policy file
-  template:
-    src: "{{ freezer_policy_file_path }}"
-    dest: "{{ node_config_directory }}/{{ item.key }}/{{ freezer_policy_file }}"
-    mode: "0660"
-  become: true
-  when:
-    - freezer_policy_file is defined
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ freezer_services }}"
-  notify:
-    - "Restart {{ item.key }} container"

ansible/roles/freezer/tasks/config_validate.yml

@@ -1,7 +0,0 @@
----
-- import_role:
-    name: service-config-validate
-  vars:
-    service_config_validate_services: "{{ freezer_services }}"
-    service_name: "{{ project_name }}"
-    service_config_validation: "{{ freezer_config_validation }}"

ansible/roles/freezer/tasks/copy-certs.yml

@@ -1,6 +0,0 @@
----
-- name: "Copy certificates and keys for {{ project_name }}"
-  import_role:
-    role: service-cert-copy
-  vars:
-    project_services: "{{ freezer_services }}"

ansible/roles/freezer/tasks/deploy-containers.yml

@@ -1,2 +0,0 @@
----
-- import_tasks: check-containers.yml

ansible/roles/freezer/tasks/deploy.yml

@@ -1,14 +0,0 @@
----
-- import_tasks: register.yml
-
-- import_tasks: config.yml
-
-- import_tasks: check-containers.yml
-
-- include_tasks: clone.yml
-  when: freezer_dev_mode | bool
-
-- import_tasks: bootstrap.yml
-
-- name: Flush handlers
-  meta: flush_handlers

ansible/roles/freezer/tasks/loadbalancer.yml

@@ -1,7 +0,0 @@
----
-- name: "Configure loadbalancer for {{ project_name }}"
-  import_role:
-    name: loadbalancer-config
-  vars:
-    project_services: "{{ freezer_services }}"
-  tags: always

ansible/roles/freezer/tasks/main.yml

@@ -1,2 +0,0 @@
----
-- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/freezer/tasks/precheck.yml

@@ -1,26 +0,0 @@
----
-- import_role:
-    name: service-precheck
-  vars:
-    service_precheck_services: "{{ freezer_services }}"
-    service_name: "{{ project_name }}"
-
-- name: Get container facts
-  become: true
-  kolla_container_facts:
-    container_engine: "{{ kolla_container_engine }}"
-    name:
-      - freezer_api
-  check_mode: false
-  register: container_facts
-
-- name: Checking free port for Freezer API
-  wait_for:
-    host: "{{ api_interface_address }}"
-    port: "{{ freezer_api_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - inventory_hostname in groups[freezer_services['freezer-api']['group']]
-    - container_facts['freezer_api'] is not defined

ansible/roles/freezer/tasks/pull.yml

@@ -1,3 +0,0 @@
----
-- import_role:
-    role: service-images-pull

ansible/roles/freezer/tasks/reconfigure.yml

@@ -1,2 +0,0 @@
----
-- import_tasks: deploy.yml

ansible/roles/freezer/tasks/register.yml

@@ -1,7 +0,0 @@
----
-- import_role:
-    name: service-ks-register
-  vars:
-    service_ks_register_auth: "{{ openstack_freezer_auth }}"
-    service_ks_register_services: "{{ freezer_ks_services }}"
-    service_ks_register_users: "{{ freezer_ks_users }}"

ansible/roles/freezer/tasks/stop.yml

@@ -1,6 +0,0 @@
----
-- import_role:
-    name: service-stop
-  vars:
-    project_services: "{{ freezer_services }}"
-    service_name: "{{ project_name }}"

ansible/roles/freezer/tasks/upgrade.yml

@@ -1,9 +0,0 @@
----
-- import_tasks: config.yml
-
-- import_tasks: check-containers.yml
-
-- import_tasks: bootstrap_service.yml
-
-- name: Flush handlers
-  meta: flush_handlers

ansible/roles/freezer/templates/freezer-api.json.j2

@@ -1,32 +0,0 @@
-{% set apache_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
-{% set apache_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
-{
-    "command": "{{ apache_cmd }} -DFOREGROUND",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/freezer.conf",
-            "dest": "/etc/freezer/freezer.conf",
-            "owner": "freezer",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/wsgi-freezer-api.conf",
-            "dest": "/etc/{{ apache_dir }}/wsgi-freezer.conf",
-            "owner": "freezer",
-            "perm": "0600"
-        }{% if freezer_policy_file is defined %},
-        {
-            "source": "{{ container_config_directory }}/{{ freezer_policy_file }}",
-            "dest": "/etc/freezer/{{ freezer_policy_file }}",
-            "owner": "freezer",
-            "perm": "0600"
-        }{% endif %}
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/freezer",
-            "owner": "freezer:freezer",
-            "recurse": true
-        }
-    ]
-}

ansible/roles/freezer/templates/freezer-scheduler.json.j2

@@ -1,24 +0,0 @@
-{
-    "command": "freezer-scheduler --config-file /etc/freezer/freezer.conf start",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/freezer.conf",
-            "dest": "/etc/freezer/freezer.conf",
-            "owner": "freezer",
-            "perm": "0600"
-        }{% if freezer_policy_file is defined %},
-        {
-            "source": "{{ container_config_directory }}/{{ freezer_policy_file }}",
-            "dest": "/etc/freezer/{{ freezer_policy_file }}",
-            "owner": "freezer",
-            "perm": "0600"
-        }{% endif %}
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/freezer",
-            "owner": "freezer:freezer",
-            "recurse": true
-        }
-    ]
-}

ansible/roles/freezer/templates/freezer.conf.j2

@@ -1,75 +0,0 @@
-[DEFAULT]
-debug = {{ freezer_logging_debug }}
-
-log_dir = /var/log/kolla/freezer
-
-{% if service_name == 'freezer-api' %}
-bind_host = {{ api_interface_address }}
-bind_port = {{ freezer_api_port }}
-{% endif %}
-
-{% if service_name == 'freezer-scheduler' %}
-client_id = {{ inventory_hostname }}
-jobs_dir = /etc/freezer/scheduler/conf.d
-
-os_username = {{ openstack_auth.username }}
-os_password = {{ openstack_auth.password }}
-os_auth_url = {{ openstack_auth.auth_url }}
-os_project_name = {{ openstack_auth.project_name }}
-os_project_domain_name = {{ default_project_domain_name }}
-os_user_domain_name = {{ openstack_auth.user_domain_name }}
-{% endif %}
-
-{% if service_name == 'freezer-api' %}
-[keystone_authtoken]
-service_type = backup
-www_authenticate_uri = {{ keystone_internal_url }}
-auth_url = {{ keystone_internal_url }}
-auth_type = password
-project_domain_id = {{ default_project_domain_id }}
-user_domain_id = {{ default_user_domain_id }}
-project_name = service
-username = {{ freezer_keystone_user }}
-password = {{ freezer_keystone_password }}
-cafile = {{ openstack_cacert }}
-region_name = {{ openstack_region_name }}
-
-memcache_security_strategy = ENCRYPT
-memcache_secret_key = {{ memcache_secret_key }}
-memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-
-{% if freezer_policy_file is defined %}
-[oslo_policy]
-policy_file = {{ freezer_policy_file }}
-{% endif %}
-
-[oslo_middleware]
-enable_proxy_headers_parsing = True
-
-[paste_deploy]
-config_file = /etc/freezer/freezer-paste.ini
-
-
-{% if freezer_database_backend == 'mariadb' %}
-[storage]
-backend = sqlachemy
-driver = sqlalchemy
-
-[database]
-connection = mysql+pymysql://{{ freezer_database_user }}:{{ freezer_database_password }}@{{ freezer_database_address }}/{{ freezer_database_name }}
-connection_recycle_time = {{ database_connection_recycle_time }}
-max_pool_size = {{ database_max_pool_size }}
-max_retries = -1
-{% endif %}
-
-{% if freezer_database_backend == 'elasticsearch' %}
-[storage]
-backend = elasticsearch
-driver = elasticsearch
-
-[elasticsearch]
-hosts = {{ freezer_es_protocol }}://{{ freezer_es_address | put_address_in_context('url') }}:{{ freezer_es_port }}
-number_of_replicas = {{ freezer_elasticsearch_replicas }}
-index = freezer
-{% endif %}
-{% endif %}

ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2

@@ -1,38 +0,0 @@
-{% set freezer_log_dir = '/var/log/kolla/freezer' %}
-{% set python_path = '/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages' %}
-Listen {{ api_interface_address | put_address_in_context('url') }}:{{ freezer_api_port }}
-
-ServerSignature Off
-ServerTokens Prod
-TraceEnable off
-TimeOut {{ kolla_httpd_timeout }}
-KeepAliveTimeout {{ kolla_httpd_keep_alive }}
-
-ErrorLog "{{ freezer_log_dir }}/apache-error.log"
-<IfModule log_config_module>
-    CustomLog "{{ freezer_log_dir }}/apache-access.log" common
-</IfModule>
-
-{% if freezer_logging_debug | bool %}
-LogLevel info
-{% endif %}
-
-<VirtualHost *:{{ freezer_api_port }}>
-    WSGIDaemonProcess freezer-api processes={{ freezer_api_workers }} threads=1 user=freezer display-name=freezer-api
-    WSGIProcessGroup freezer-api
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIScriptAlias / {{ python_path }}/freezer_api/cmd/wsgi.py
-
-    ErrorLog {{ freezer_log_dir }}/freezer-api.log
-    LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
-    CustomLog {{ freezer_log_dir }}/freezer-api_access.log logformat
-
-    <Directory {{ python_path }}/freezer_api>
-      Options Indexes FollowSymLinks MultiViews
-      Require all granted
-      AllowOverride None
-      Order allow,deny
-      allow from all
-      LimitRequestBody 102400
-    </Directory>
-</VirtualHost>

ansible/roles/freezer/vars/main.yml

@@ -1,2 +0,0 @@
----
-project_name: "freezer"

ansible/roles/horizon/defaults/main.yml

@@ -9,7 +9,6 @@ horizon_services:
       ENABLE_BLAZAR: "{{ 'yes' if enable_horizon_blazar | bool else 'no' }}"
       ENABLE_CLOUDKITTY: "{{ 'yes' if enable_horizon_cloudkitty | bool else 'no' }}"
       ENABLE_DESIGNATE: "{{ 'yes' if enable_horizon_designate | bool else 'no' }}"
-      ENABLE_FREEZER: "{{ 'yes' if enable_horizon_freezer | bool else 'no' }}"
       ENABLE_HEAT: "{{ 'yes' if enable_horizon_heat | bool else 'no' }}"
       ENABLE_IRONIC: "{{ 'yes' if enable_horizon_ironic | bool else 'no' }}"
       ENABLE_MAGNUM: "{{ 'yes' if enable_horizon_magnum | bool else 'no' }}"

ansible/roles/horizon/tasks/config.yml

@@ -25,7 +25,6 @@
     - { name: "cinder", enabled: "{{ enable_cinder_horizon_policy_file }}" }
     - { name: "cloudkitty", enabled: "{{ enable_horizon_cloudkitty }}" }
     - { name: "designate", enabled: "{{ enable_horizon_designate }}" }
-    - { name: "freezer", enabled: "{{ enable_horizon_freezer }}" }
     - { name: "glance", enabled: "{{ enable_glance_horizon_policy_file }}" }
     - { name: "heat", enabled: "{{ enable_heat_horizon_policy_file }}" }
     - { name: "ironic", enabled: "{{ enable_horizon_ironic }}" }

ansible/roles/loadbalancer/tasks/precheck.yml

@@ -348,19 +348,6 @@
     - haproxy_stat.find('gnocchi_api') == -1
     - haproxy_vip_prechecks
 
-- name: Checking free port for Freezer API HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ freezer_api_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - enable_freezer | bool
-    - haproxy_stat.find('freezer_api') == -1
-    - inventory_hostname in groups['loadbalancer']
-    - haproxy_vip_prechecks
-
 - name: Checking free port for Grafana server HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"

ansible/site.yml

@@ -33,7 +33,6 @@
         - enable_cyborg_{{ enable_cyborg | bool }}
         - enable_designate_{{ enable_designate | bool }}
         - enable_etcd_{{ enable_etcd | bool }}
-        - enable_freezer_{{ enable_freezer | bool }}
         - enable_glance_{{ enable_glance | bool }}
         - enable_gnocchi_{{ enable_gnocchi | bool }}
         - enable_grafana_{{ enable_grafana | bool }}
@@ -172,11 +171,6 @@
             tasks_from: loadbalancer
           tags: etcd
           when: enable_etcd | bool
-        - include_role:
-            name: freezer
-            tasks_from: loadbalancer
-          tags: freezer
-          when: enable_freezer | bool
         - include_role:
             name: glance
             tasks_from: loadbalancer
@@ -1045,21 +1039,6 @@
     - { role: cloudkitty,
         tags: cloudkitty }
 
-- name: Apply role freezer
-  gather_facts: false
-  hosts:
-    - freezer-api
-    - freezer-scheduler
-    - '&enable_freezer_True'
-  serial: '{{ kolla_serial|default("0") }}'
-  max_fail_percentage: >-
-    {{ freezer_max_fail_percentage |
-       default(kolla_max_fail_percentage) |
-       default(100) }}
-  roles:
-    - { role: freezer,
-        tags: freezer }
-
 - name: Apply role senlin
   gather_facts: false
   hosts:

etc/kolla/globals.yml

@@ -352,7 +352,6 @@ workaround_ansible_issue_8743: yes
 #enable_etcd: "no"
 #enable_fluentd: "yes"
 #enable_fluentd_systemd: "{{ (enable_fluentd | bool) and (enable_central_logging | bool) }}"
-#enable_freezer: "no"
 #enable_gnocchi: "no"
 #enable_gnocchi_statsd: "no"
 #enable_grafana: "no"
@@ -362,7 +361,6 @@ workaround_ansible_issue_8743: yes
 #enable_horizon_blazar: "{{ enable_blazar | bool }}"
 #enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}"
 #enable_horizon_designate: "{{ enable_designate | bool }}"
-#enable_horizon_freezer: "{{ enable_freezer | bool }}"
 #enable_horizon_heat: "{{ enable_heat | bool }}"
 #enable_horizon_ironic: "{{ enable_ironic | bool }}"
 #enable_horizon_magnum: "{{ enable_magnum | bool }}"
@@ -807,15 +805,6 @@ workaround_ansible_issue_8743: yes
 #  - host1:port1
 #  - host2:port2
 
-#########
-# Freezer
-#########
-# Freezer can utilize two different database backends, elasticsearch or mariadb.
-# Elasticsearch is preferred, however it is not compatible with the version deployed
-# by kolla-ansible. You must first setup an external elasticsearch with 2.3.0.
-# By default, kolla-ansible deployed mariadb is the used database backend.
-#freezer_database_backend: "mariadb"
-
 ##########
 # Telegraf
 ##########

etc/kolla/passwords.yml

@@ -92,9 +92,6 @@ cloudkitty_keystone_password:
 cyborg_database_password:
 cyborg_keystone_password:
 
-freezer_database_password:
-freezer_keystone_password:
-
 sahara_database_password:
 sahara_keystone_password:
 

releasenotes/notes/drop-freezer-f41acd5519d643bf.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support for deploying ``Freezer`` has been dropped.

tests/templates/inventory.j2

@@ -167,9 +167,6 @@ control
 [cloudkitty:children]
 control
 
-[freezer:children]
-control
-
 [memcached:children]
 control
 
@@ -373,13 +370,6 @@ cloudkitty
 [cloudkitty-processor:children]
 cloudkitty
 
-# Freezer
-[freezer-api:children]
-freezer
-
-[freezer-scheduler:children]
-freezer
-
 # iSCSI
 [iscsid:children]
 compute