diff --git a/README.rst b/README.rst index 6f407d66bb..b462534bf7 100644 --- a/README.rst +++ b/README.rst @@ -46,7 +46,6 @@ Kolla-Ansible deploys containers for the following OpenStack projects: - `Ceilometer `__ - `Cinder `__ - `CloudKitty `__ -- `Congress `__ - `Cyborg `__ - `Designate `__ - `Freezer `__ diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 86b68b7581..940cae3a75 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -248,8 +248,6 @@ cinder_external_fqdn: "{{ kolla_external_fqdn }}" cinder_api_port: "8776" cinder_api_listen_port: "{{ cinder_api_port }}" -congress_api_port: "1789" - cloudkitty_api_port: "8889" collectd_udp_port: "25826" @@ -566,7 +564,6 @@ enable_cinder_backend_zfssa_iscsi: "no" enable_cinder_backend_quobyte: "no" enable_cloudkitty: "no" enable_collectd: "no" -enable_congress: "no" enable_cyborg: "no" enable_designate: "no" enable_etcd: "no" @@ -579,7 +576,6 @@ enable_heat: "{{ enable_openstack_core | bool }}" enable_horizon: "{{ enable_openstack_core | bool }}" enable_horizon_blazar: "{{ enable_blazar | bool }}" enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}" -enable_horizon_congress: "{{ enable_congress | bool }}" enable_horizon_designate: "{{ enable_designate | bool }}" enable_horizon_fwaas: "{{ enable_neutron_fwaas | bool }}" enable_horizon_freezer: "{{ enable_freezer | bool }}" @@ -939,7 +935,6 @@ horizon_keystone_multidomain: False # in horizon. enable_ceilometer_horizon_policy_file: "{{ enable_ceilometer }}" enable_cinder_horizon_policy_file: "{{ enable_cinder }}" -enable_congress_horizon_policy_file: "{{ enable_congress }}" enable_glance_horizon_policy_file: "{{ enable_glance }}" enable_heat_horizon_policy_file: "{{ enable_heat }}" enable_keystone_horizon_policy_file: "{{ enable_keystone }}" diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one index 7e79458062..e0c1fd323e 100644 --- a/ansible/inventory/all-in-one +++ b/ansible/inventory/all-in-one @@ -188,9 +188,6 @@ control control compute -[congress:children] -control - [tacker:children] control @@ -583,16 +580,6 @@ compute [ceilometer-ipmi:children] compute -# Congress -[congress-api:children] -congress - -[congress-datasource:children] -congress - -[congress-policy-engine:children] -congress - # Multipathd [multipathd:children] compute diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index 3efd784b6c..3512de4d6d 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -201,9 +201,6 @@ control control compute -[congress:children] -control - [panko:children] control @@ -578,16 +575,6 @@ compute [cyborg-conductor:children] cyborg -# Congress -[congress-api:children] -congress - -[congress-datasource:children] -congress - -[congress-policy-engine:children] -congress - # Panko [panko-api:children] panko diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index f274e7b3e7..9da9cc5b49 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -116,8 +116,6 @@ fluentd_input_openstack_services: enabled: "{{ enable_cinder | bool }}" - name: cloudkitty enabled: "{{ enable_cloudkitty | bool }}" - - name: congress - enabled: "{{ enable_congress | bool }}" - name: cyborg enabled: "{{ enable_cyborg | bool }}" - name: designate diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index a1bbc23ec8..fc18f49720 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -287,7 +287,6 @@ - { name: "cinder", enabled: "{{ enable_cinder }}" } - { name: "cloudkitty", enabled: "{{ enable_cloudkitty }}" } - { name: "collectd", enabled: "{{ enable_collectd }}" } - - { name: "congress", enabled: "{{ enable_congress }}" } - { name: "cyborg", enabled: "{{ enable_cyborg }}" } - { name: "designate", enabled: "{{ enable_designate }}" } - { name: "elasticsearch", enabled: "{{ enable_elasticsearch }}" } diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 index e36bbd183c..f1aa019d42 100644 --- a/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 +++ b/ansible/roles/common/templates/conf/filter/01-rewrite-0.12.conf.j2 @@ -19,7 +19,6 @@ rewriterule16 programname ^(designate-api|designate-central|designate-manage|designate-mdns|designate-sink|designate-worker)$ openstack_python rewriterule17 programname ^(manila-api|manila-data|manila-manage|manila-share|manila-scheduler)$ openstack_python rewriterule18 programname ^(trove-api|trove-conductor|trove-manage|trove-taskmanager)$ openstack_python - rewriterule19 programname ^(congress-server)$ openstack_python rewriterule20 programname ^(murano-api|murano-engine)$ openstack_python rewriterule21 programname ^(senlin-api|senlin-conductor|senlin-engine|senlin-health-manager)$ openstack_python rewriterule22 programname ^(watcher-api|watcher-applier|watcher-db-manage|watcher-decision-engine)$ openstack_python diff --git a/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 b/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 index 8252984f78..2357d8ec29 100644 --- a/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 +++ b/ansible/roles/common/templates/conf/filter/01-rewrite-0.14.conf.j2 @@ -96,11 +96,6 @@ pattern ^(trove-api|trove-conductor|trove-manage|trove-taskmanager)$ tag openstack_python - - key programname - pattern ^(congress-server)$ - tag openstack_python - key programname pattern ^(murano-api|murano-engine)$ diff --git a/ansible/roles/common/templates/cron-logrotate-congress.conf.j2 b/ansible/roles/common/templates/cron-logrotate-congress.conf.j2 deleted file mode 100644 index 90b97eb170..0000000000 --- a/ansible/roles/common/templates/cron-logrotate-congress.conf.j2 +++ /dev/null @@ -1,3 +0,0 @@ -"/var/log/kolla/congress/*.log" -{ -} diff --git a/ansible/roles/common/templates/cron.json.j2 b/ansible/roles/common/templates/cron.json.j2 index 46e8de9aef..e7ba87e1f4 100644 --- a/ansible/roles/common/templates/cron.json.j2 +++ b/ansible/roles/common/templates/cron.json.j2 @@ -9,7 +9,6 @@ ( 'cinder', enable_cinder ), ( 'cloudkitty', enable_cloudkitty ), ( 'collectd', enable_collectd ), - ( 'congress', enable_congress ), ( 'cyborg', enable_cyborg ), ( 'designate', enable_designate ), ( 'elasticsearch', enable_elasticsearch ), diff --git a/ansible/roles/congress/defaults/main.yml b/ansible/roles/congress/defaults/main.yml deleted file mode 100644 index 4a324effb9..0000000000 --- a/ansible/roles/congress/defaults/main.yml +++ /dev/null @@ -1,131 +0,0 @@ ---- -project_name: "congress" - -congress_services: - congress-api: - container_name: congress_api - group: congress-api - enabled: true - image: "{{ congress_api_image_full }}" - volumes: "{{ congress_api_default_volumes + congress_api_extra_volumes }}" - dimensions: "{{ congress_api_dimensions }}" - haproxy: - congress_api: - enabled: "{{ enable_congress }}" - mode: "http" - external: false - port: "{{ congress_api_port }}" - congress_api_external: - enabled: "{{ enable_congress }}" - mode: "http" - external: true - port: "{{ congress_api_port }}" - congress-policy-engine: - container_name: congress_policy_engine - group: congress-policy-engine - enabled: true - image: "{{ congress_policy_engine_image_full }}" - volumes: "{{ congress_policy_engine_default_volumes + congress_policy_engine_extra_volumes }}" - dimensions: "{{ congress_policy_engine_dimensions }}" - congress-datasource: - container_name: congress_datasource - group: congress-datasource - enabled: true - image: "{{ congress_datasource_image_full }}" - volumes: "{{ congress_datasource_default_volumes + congress_datasource_extra_volumes }}" - dimensions: "{{ congress_datasource_dimensions }}" - - -#################### -# Database -#################### -congress_database_name: "congress" -congress_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}congress{% endif %}" -congress_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}" - - -#################### -# Docker -#################### -congress_install_type: "{{ kolla_install_type }}" -congress_tag: "{{ openstack_tag }}" - -congress_policy_engine_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ congress_install_type }}-congress-policy-engine" -congress_policy_engine_tag: "{{ congress_tag }}" -congress_policy_engine_image_full: "{{ congress_policy_engine_image }}:{{ congress_policy_engine_tag }}" - -congress_datasource_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ congress_install_type }}-congress-datasource" -congress_datasource_tag: "{{ congress_tag }}" -congress_datasource_image_full: "{{ congress_datasource_image }}:{{ congress_datasource_tag }}" - -congress_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ congress_install_type }}-congress-api" -congress_api_tag: "{{ congress_tag }}" -congress_api_image_full: "{{ congress_api_image }}:{{ congress_api_tag }}" - -congress_api_dimensions: "{{ default_container_dimensions }}" -congress_policy_engine_dimensions: "{{ default_container_dimensions }}" -congress_datasource_dimensions: "{{ default_container_dimensions }}" - -congress_api_default_volumes: - - "{{ node_config_directory }}/congress-api/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}" - - "kolla_logs:/var/log/kolla/" - - "{{ kolla_dev_repos_directory ~ '/congress/congress:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/congress' if congress_dev_mode | bool else '' }}" -congress_policy_engine_default_volumes: - - "{{ node_config_directory }}/congress-policy-engine/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}" - - "kolla_logs:/var/log/kolla/" - - "{{ kolla_dev_repos_directory ~ '/congress/congress:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/congress' if congress_dev_mode | bool else '' }}" -congress_datasource_default_volumes: - - "{{ node_config_directory }}/congress-datasource/:{{ container_config_directory }}/:ro" - - "/etc/localtime:/etc/localtime:ro" - - "{{ '/etc/timezone:/etc/timezone:ro' if kolla_base_distro in ['debian', 'ubuntu'] else '' }}" - - "kolla_logs:/var/log/kolla/" - - "{{ kolla_dev_repos_directory ~ '/congress/congress:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/congress' if congress_dev_mode | bool else '' }}" - -congress_extra_volumes: "{{ default_extra_volumes }}" -congress_api_extra_volumes: "{{ congress_extra_volumes }}" -congress_policy_engine_extra_volumes: "{{ congress_extra_volumes }}" -congress_datasource_extra_volumes: "{{ congress_extra_volumes }}" - -#################### -# OpenStack -#################### -congress_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ congress_api_port }}" -congress_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ congress_api_port }}" -congress_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ congress_api_port }}" - -congress_logging_debug: "{{ openstack_logging_debug }}" - -congress_keystone_user: "congress" - -openstack_congress_auth: "{{ openstack_auth }}" - - -#################### -# Kolla -#################### -congress_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}" -congress_dev_repos_pull: "{{ kolla_dev_repos_pull }}" -congress_dev_mode: "{{ kolla_dev_mode }}" -congress_source_version: "{{ kolla_source_version }}" - -#################### -# Keystone -#################### -congress_ks_services: - - name: "congress" - type: "policy" - description: "Congress Service" - endpoints: - - {'interface': 'admin', 'url': '{{ congress_admin_endpoint }}'} - - {'interface': 'internal', 'url': '{{ congress_internal_endpoint }}'} - - {'interface': 'public', 'url': '{{ congress_public_endpoint }}'} - -congress_ks_users: - - project: "service" - user: "{{ congress_keystone_user }}" - password: "{{ congress_keystone_password }}" - role: "admin" diff --git a/ansible/roles/congress/handlers/main.yml b/ansible/roles/congress/handlers/main.yml deleted file mode 100644 index 7295a953ac..0000000000 --- a/ansible/roles/congress/handlers/main.yml +++ /dev/null @@ -1,45 +0,0 @@ ---- -- name: Restart congress-api container - vars: - service_name: "congress-api" - service: "{{ congress_services[service_name] }}" - become: true - kolla_docker: - 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" - -- name: Restart congress-policy-engine container - vars: - service_name: "congress-policy-engine" - service: "{{ congress_services[service_name] }}" - become: true - kolla_docker: - 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" - -- name: Restart congress-datasource container - vars: - service_name: "congress-datasource" - service: "{{ congress_services[service_name] }}" - become: true - kolla_docker: - 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" diff --git a/ansible/roles/congress/meta/main.yml b/ansible/roles/congress/meta/main.yml deleted file mode 100644 index 6b4fff8fef..0000000000 --- a/ansible/roles/congress/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: common } diff --git a/ansible/roles/congress/tasks/bootstrap.yml b/ansible/roles/congress/tasks/bootstrap.yml deleted file mode 100644 index ab5e93c947..0000000000 --- a/ansible/roles/congress/tasks/bootstrap.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- name: Creating congress database - become: true - kolla_toolbox: - module_name: mysql_db - module_args: - login_host: "{{ database_address }}" - login_port: "{{ database_port }}" - login_user: "{{ database_user }}" - login_password: "{{ database_password }}" - name: "{{ congress_database_name }}" - run_once: True - delegate_to: "{{ groups['congress-api'][0] }}" - when: - - not use_preconfigured_databases | bool - -- name: Creating congress database user and setting permissions - become: true - kolla_toolbox: - module_name: mysql_user - module_args: - login_host: "{{ database_address }}" - login_port: "{{ database_port }}" - login_user: "{{ database_user }}" - login_password: "{{ database_password }}" - name: "{{ congress_database_user }}" - password: "{{ congress_database_password }}" - host: "%" - priv: "{{ congress_database_name }}.*:ALL" - append_privs: "yes" - run_once: True - delegate_to: "{{ groups['congress-api'][0] }}" - when: - - not use_preconfigured_databases | bool - -- include_tasks: bootstrap_service.yml diff --git a/ansible/roles/congress/tasks/bootstrap_service.yml b/ansible/roles/congress/tasks/bootstrap_service.yml deleted file mode 100644 index 61f001d4b7..0000000000 --- a/ansible/roles/congress/tasks/bootstrap_service.yml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- name: Running congress bootstrap container - vars: - congress_api: "{{ congress_services['congress-api'] }}" - become: true - kolla_docker: - action: "start_container" - common_options: "{{ docker_common_options }}" - detach: False - environment: - KOLLA_BOOTSTRAP: - KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}" - image: "{{ congress_api.image }}" - labels: - BOOTSTRAP: - name: "bootstrap_congress" - restart_policy: no - volumes: "{{ congress_api.volumes|reject('equalto', '')|list }}" - run_once: True - delegate_to: "{{ groups[congress_api.group][0] }}" diff --git a/ansible/roles/congress/tasks/check-containers.yml b/ansible/roles/congress/tasks/check-containers.yml deleted file mode 100644 index 7492624828..0000000000 --- a/ansible/roles/congress/tasks/check-containers.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- name: Check congress containers - become: true - kolla_docker: - 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: "{{ congress_services }}" - notify: - - "Restart {{ item.key }} container" diff --git a/ansible/roles/congress/tasks/check.yml b/ansible/roles/congress/tasks/check.yml deleted file mode 100644 index ed97d539c0..0000000000 --- a/ansible/roles/congress/tasks/check.yml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/ansible/roles/congress/tasks/clone.yml b/ansible/roles/congress/tasks/clone.yml deleted file mode 100644 index ef914c29e2..0000000000 --- a/ansible/roles/congress/tasks/clone.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: Cloning congress source repository for development - become: true - git: - repo: "{{ congress_git_repository }}" - dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}" - update: "{{ congress_dev_repos_pull }}" - version: "{{ congress_source_version }}" diff --git a/ansible/roles/congress/tasks/config.yml b/ansible/roles/congress/tasks/config.yml deleted file mode 100644 index 1508a0edb9..0000000000 --- a/ansible/roles/congress/tasks/config.yml +++ /dev/null @@ -1,86 +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: "{{ congress_services }}" - -- name: Check if policies shall be overwritten - stat: - path: "{{ item }}" - delegate_to: localhost - run_once: True - register: congress_policy - with_first_found: - - files: "{{ supported_policy_format_list }}" - paths: - - "{{ node_custom_config }}/congress/" - skip: true - -- name: Set congress policy file - set_fact: - congress_policy_file: "{{ congress_policy.results.0.stat.path | basename }}" - congress_policy_file_path: "{{ congress_policy.results.0.stat.path }}" - when: - - congress_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: "{{ congress_services }}" - notify: - - "Restart {{ item.key }} container" - -- name: Copying over congress.conf - vars: - service_name: "{{ item.key }}" - merge_configs: - sources: - - "{{ role_path }}/templates/congress.conf.j2" - - "{{ node_custom_config }}/global.conf" - - "{{ node_custom_config }}/congress.conf" - - "{{ node_custom_config }}/congress/{{ item.key }}.conf" - - "{{ node_custom_config }}/congress/{{ inventory_hostname }}/congress.conf" - dest: "{{ node_config_directory }}/{{ item.key }}/congress.conf" - mode: "0660" - become: true - when: - - inventory_hostname in groups[item.value.group] - - item.value.enabled | bool - with_dict: "{{ congress_services }}" - notify: - - "Restart {{ item.key }} container" - -- name: Copying over existing policy file - template: - src: "{{ congress_policy_file_path }}" - dest: "{{ node_config_directory }}/{{ item.key }}/{{ congress_policy_file }}" - mode: "0660" - become: true - when: - - congress_policy_file is defined - - inventory_hostname in groups[item.value.group] - - item.value.enabled | bool - with_dict: "{{ congress_services }}" - notify: - - "Restart {{ item.key }} container" - -- include_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/congress/tasks/copy-certs.yml b/ansible/roles/congress/tasks/copy-certs.yml deleted file mode 100644 index 40b67c323d..0000000000 --- a/ansible/roles/congress/tasks/copy-certs.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: "Copy certificates and keys for {{ project_name }}" - import_role: - role: service-cert-copy - vars: - project_services: "{{ congress_services }}" diff --git a/ansible/roles/congress/tasks/deploy-containers.yml b/ansible/roles/congress/tasks/deploy-containers.yml deleted file mode 100644 index eb24ab5c7a..0000000000 --- a/ansible/roles/congress/tasks/deploy-containers.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- import_tasks: check-containers.yml diff --git a/ansible/roles/congress/tasks/deploy.yml b/ansible/roles/congress/tasks/deploy.yml deleted file mode 100644 index b1fa5dd1a5..0000000000 --- a/ansible/roles/congress/tasks/deploy.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -- include_tasks: register.yml - when: inventory_hostname in groups['congress-api'] - -- include_tasks: config.yml - when: inventory_hostname in groups['congress-api'] or - inventory_hostname in groups['congress-policy-engine'] or - inventory_hostname in groups['congress-datasource'] - -- include_tasks: clone.yml - when: congress_dev_mode | bool - -- include_tasks: bootstrap.yml - when: inventory_hostname in groups['congress-api'] - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/congress/tasks/loadbalancer.yml b/ansible/roles/congress/tasks/loadbalancer.yml deleted file mode 100644 index 4e271bfd3e..0000000000 --- a/ansible/roles/congress/tasks/loadbalancer.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: "Configure haproxy for {{ project_name }}" - import_role: - name: haproxy-config - vars: - project_services: "{{ congress_services }}" - tags: always diff --git a/ansible/roles/congress/tasks/main.yml b/ansible/roles/congress/tasks/main.yml deleted file mode 100644 index bc5d1e6257..0000000000 --- a/ansible/roles/congress/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include_tasks: "{{ kolla_action }}.yml" diff --git a/ansible/roles/congress/tasks/precheck.yml b/ansible/roles/congress/tasks/precheck.yml deleted file mode 100644 index f9dd246772..0000000000 --- a/ansible/roles/congress/tasks/precheck.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- import_role: - name: service-precheck - vars: - service_precheck_services: "{{ congress_services }}" - service_name: "{{ project_name }}" - -- name: Get container facts - become: true - kolla_container_facts: - name: - - congress_api - register: container_facts - -- name: Checking free port for Congress API - wait_for: - host: "{{ api_interface_address }}" - port: "{{ congress_api_port }}" - connect_timeout: 1 - timeout: 1 - state: stopped - when: - - container_facts['congress_api'] is not defined - - inventory_hostname in groups['congress-api'] diff --git a/ansible/roles/congress/tasks/pull.yml b/ansible/roles/congress/tasks/pull.yml deleted file mode 100644 index 5379a4d352..0000000000 --- a/ansible/roles/congress/tasks/pull.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Pulling congress images - become: true - kolla_docker: - action: "pull_image" - common_options: "{{ docker_common_options }}" - image: "{{ item.value.image }}" - when: - - inventory_hostname in groups[item.value.group] - - item.value.enabled | bool - with_dict: "{{ congress_services }}" diff --git a/ansible/roles/congress/tasks/reconfigure.yml b/ansible/roles/congress/tasks/reconfigure.yml deleted file mode 100644 index f670a5b78d..0000000000 --- a/ansible/roles/congress/tasks/reconfigure.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include_tasks: deploy.yml diff --git a/ansible/roles/congress/tasks/register.yml b/ansible/roles/congress/tasks/register.yml deleted file mode 100644 index 7afd6ad7c5..0000000000 --- a/ansible/roles/congress/tasks/register.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- import_role: - name: service-ks-register - vars: - service_ks_register_auth: "{{ openstack_congress_auth }}" - service_ks_register_services: "{{ congress_ks_services }}" - service_ks_register_users: "{{ congress_ks_users }}" - tags: always diff --git a/ansible/roles/congress/tasks/stop.yml b/ansible/roles/congress/tasks/stop.yml deleted file mode 100644 index 89d66300a3..0000000000 --- a/ansible/roles/congress/tasks/stop.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- import_role: - name: service-stop - vars: - project_services: "{{ congress_services }}" - service_name: "{{ project_name }}" diff --git a/ansible/roles/congress/tasks/upgrade.yml b/ansible/roles/congress/tasks/upgrade.yml deleted file mode 100644 index 20ccddc8f1..0000000000 --- a/ansible/roles/congress/tasks/upgrade.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- include_tasks: config.yml - -- include_tasks: bootstrap_service.yml - -- name: Flush handlers - meta: flush_handlers diff --git a/ansible/roles/congress/templates/congress-api.json.j2 b/ansible/roles/congress/templates/congress-api.json.j2 deleted file mode 100644 index bc8e67291d..0000000000 --- a/ansible/roles/congress/templates/congress-api.json.j2 +++ /dev/null @@ -1,24 +0,0 @@ -{ - "command": "congress-server --api --node-id=api-node --config-file /etc/congress/congress.conf", - "config_files": [ - { - "source": "{{ container_config_directory }}/congress.conf", - "dest": "/etc/congress/congress.conf", - "owner": "congress", - "perm": "0600" - }{% if congress_policy_file is defined %}, - { - "source": "{{ container_config_directory }}/{{ congress_policy_file }}", - "dest": "/etc/congress/{{ congress_policy_file }}", - "owner": "congress", - "perm": "0600" - }{% endif %} - ], - "permissions": [ - { - "path": "/var/log/kolla/congress", - "owner": "congress:congress", - "recurse": true - } - ] -} diff --git a/ansible/roles/congress/templates/congress-datasource.json.j2 b/ansible/roles/congress/templates/congress-datasource.json.j2 deleted file mode 100644 index ad75b611c1..0000000000 --- a/ansible/roles/congress/templates/congress-datasource.json.j2 +++ /dev/null @@ -1,24 +0,0 @@ -{ - "command": "congress-server --datasources --node-id=data-node --config-file /etc/congress/congress.conf", - "config_files": [ - { - "source": "{{ container_config_directory }}/congress.conf", - "dest": "/etc/congress/congress.conf", - "owner": "congress", - "perm": "0600" - }{% if congress_policy_file is defined %}, - { - "source": "{{ container_config_directory }}/{{ congress_policy_file }}", - "dest": "/etc/congress/{{ congress_policy_file }}", - "owner": "congress", - "perm": "0600" - }{% endif %} - ], - "permissions": [ - { - "path": "/var/log/kolla/congress", - "owner": "congress:congress", - "recurse": true - } - ] -} diff --git a/ansible/roles/congress/templates/congress-policy-engine.json.j2 b/ansible/roles/congress/templates/congress-policy-engine.json.j2 deleted file mode 100644 index ca1dc4bbbe..0000000000 --- a/ansible/roles/congress/templates/congress-policy-engine.json.j2 +++ /dev/null @@ -1,24 +0,0 @@ -{ - "command": "congress-server --policy-engine --node-id=policy-node --config-file /etc/congress/congress.conf", - "config_files": [ - { - "source": "{{ container_config_directory }}/congress.conf", - "dest": "/etc/congress/congress.conf", - "owner": "congress", - "perm": "0600" - }{% if congress_policy_file is defined %}, - { - "source": "{{ container_config_directory }}/{{ congress_policy_file }}", - "dest": "/etc/congress/{{ congress_policy_file }}", - "owner": "congress", - "perm": "0600" - }{% endif %} - ], - "permissions": [ - { - "path": "/var/log/kolla/congress", - "owner": "congress:congress", - "recurse": true - } - ] -} diff --git a/ansible/roles/congress/templates/congress.conf.j2 b/ansible/roles/congress/templates/congress.conf.j2 deleted file mode 100644 index 78858d7783..0000000000 --- a/ansible/roles/congress/templates/congress.conf.j2 +++ /dev/null @@ -1,58 +0,0 @@ -[DEFAULT] -debug = {{ congress_logging_debug }} - -log_dir = /var/log/kolla/congress - -drivers = congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver,congress.datasources.nova_driver.NovaDriver,congress.datasources.keystone_driver.KeystoneDriver,congress.datasources.ceilometer_driver.CeilometerDriver,congress.datasources.cinder_driver.CinderDriver,congress.datasources.swift_driver.SwiftDriver,congress.datasources.plexxi_driver.PlexxiDriver,congress.datasources.vCenter_driver.VCenterDriver,congress.datasources.murano_driver.MuranoDriver,congress.datasources.ironic_driver.IronicDriver - -auth_strategy = keystone - -os_region_name = {{ openstack_region_name }} - -# NOTE: set use_stderr to False or the logs will also be sent to -# stderr and collected by Docker -use_stderr = False - -my_ip = {{ api_interface_address }} - -api_paste_config = /etc/congress/api-paste.ini - -{% if service_name == 'congress-api' %} -bind_host = {{ api_interface_address }} -bind_port = {{ congress_api_port }} -{% endif %} - -transport_url = {{ rpc_transport_url }} - -[database] -connection = mysql+pymysql://{{ congress_database_user }}:{{ congress_database_password }}@{{ congress_database_address }}/{{ congress_database_name }} -max_retries = -1 - -[keystone_authtoken] -www_authenticate_uri = {{ keystone_internal_url }} -auth_url = {{ keystone_admin_url }} -auth_type = password -project_domain_id = {{ default_project_domain_id }} -user_domain_id = {{ default_user_domain_id }} -project_name = service -username = {{ congress_keystone_user }} -password = {{ congress_keystone_password }} -cafile = {{ openstack_cacert }} - -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 %} - -[oslo_messaging_notifications] -transport_url = {{ notify_transport_url }} - -{% if congress_policy_file is defined %} -[oslo_policy] -policy_file = {{ congress_policy_file }} -{% endif %} - -[oslo_middleware] -enable_proxy_headers_parsing = True - -[congress] -url = {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ congress_api_port }} diff --git a/ansible/roles/haproxy/tasks/precheck.yml b/ansible/roles/haproxy/tasks/precheck.yml index c80c972b16..0e79dd44af 100644 --- a/ansible/roles/haproxy/tasks/precheck.yml +++ b/ansible/roles/haproxy/tasks/precheck.yml @@ -226,20 +226,6 @@ - haproxy_stat.find('cloudkitty_api') == -1 - haproxy_vip_prechecks -- name: Checking free port for Congress API HAProxy - wait_for: - host: "{{ kolla_internal_vip_address }}" - port: "{{ congress_api_port }}" - connect_timeout: 1 - timeout: 1 - state: stopped - when: - - enable_congress | bool - - inventory_hostname in groups['haproxy'] - - haproxy_stat.find('congress_api') == -1 - - haproxy_vip_prechecks - - - name: Checking free port for Cyborg API HAProxy wait_for: host: "{{ kolla_internal_vip_address }}" diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml index 757d5e8e6b..90fcc753d6 100644 --- a/ansible/roles/horizon/defaults/main.yml +++ b/ansible/roles/horizon/defaults/main.yml @@ -10,7 +10,6 @@ horizon_services: environment: ENABLE_BLAZAR: "{{ 'yes' if enable_horizon_blazar | bool else 'no' }}" ENABLE_CLOUDKITTY: "{{ 'yes' if enable_horizon_cloudkitty | bool else 'no' }}" - ENABLE_CONGRESS: "{{ 'yes' if enable_horizon_congress | bool else 'no' }}" ENABLE_DESIGNATE: "{{ 'yes' if enable_horizon_designate | bool else 'no' }}" ENABLE_FWAAS: "{{ 'yes' if enable_horizon_fwaas | bool else 'no' }}" ENABLE_FREEZER: "{{ 'yes' if enable_horizon_freezer | bool else 'no' }}" diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index 051b1e38af..5aa2a06cc6 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -23,7 +23,6 @@ with_items: - { name: "ceilometer", enabled: "{{ enable_ceilometer_horizon_policy_file }}" } - { name: "cinder", enabled: "{{ enable_cinder_horizon_policy_file }}" } - - { name: "congress", enabled: "{{ enable_congress_horizon_policy_file }}" } - { name: "cloudkitty", enabled: "{{ enable_horizon_cloudkitty }}" } - { name: "designate", enabled: "{{ enable_horizon_designate }}" } - { name: "freezer", enabled: "{{ enable_horizon_freezer }}" } diff --git a/ansible/site.yml b/ansible/site.yml index bba0df1b4a..348e03eda9 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -24,7 +24,6 @@ - enable_cinder_{{ enable_cinder | bool }} - enable_cloudkitty_{{ enable_cloudkitty | bool }} - enable_collectd_{{ enable_collectd | bool }} - - enable_congress_{{ enable_congress | bool }} - enable_cyborg_{{ enable_cyborg | bool }} - enable_designate_{{ enable_designate | bool }} - enable_elasticsearch_{{ enable_elasticsearch | bool }} @@ -142,11 +141,6 @@ tasks_from: loadbalancer tags: cloudkitty when: enable_cloudkitty | bool - - include_role: - name: congress - tasks_from: loadbalancer - tags: congress - when: enable_congress | bool - include_role: name: cyborg tasks_from: loadbalancer @@ -959,19 +953,6 @@ tags: barbican, when: enable_barbican | bool } -- name: Apply role congress - gather_facts: false - hosts: - - congress-api - - congress-policy-engine - - congress-datasource - - '&enable_congress_True' - serial: '{{ kolla_serial|default("0") }}' - roles: - - { role: congress, - tags: congress, - when: enable_congress | bool } - - name: Apply role cyborg gather_facts: false hosts: diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index 24d7034b4b..b616b62339 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -251,7 +251,6 @@ #enable_cinder_backend_quobyte: "no" #enable_cloudkitty: "no" #enable_collectd: "no" -#enable_congress: "no" #enable_cyborg: "no" #enable_designate: "no" #enable_destroy_images: "no" @@ -267,7 +266,6 @@ #enable_horizon: "{{ enable_openstack_core | bool }}" #enable_horizon_blazar: "{{ enable_blazar | bool }}" #enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}" -#enable_horizon_congress: "{{ enable_congress | bool }}" #enable_horizon_designate: "{{ enable_designate | bool }}" #enable_horizon_fwaas: "{{ enable_neutron_fwaas | bool }}" #enable_horizon_freezer: "{{ enable_freezer | bool }}" diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 6c911ffeaa..c2007b07a3 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -151,9 +151,6 @@ ceilometer_keystone_password: watcher_database_password: watcher_keystone_password: -congress_database_password: -congress_keystone_password: - rally_database_password: senlin_database_password: diff --git a/releasenotes/notes/remove-congress-role-0f6a327de69e2173.yaml b/releasenotes/notes/remove-congress-role-0f6a327de69e2173.yaml index ed98cf2c76..a114919078 100644 --- a/releasenotes/notes/remove-congress-role-0f6a327de69e2173.yaml +++ b/releasenotes/notes/remove-congress-role-0f6a327de69e2173.yaml @@ -1,5 +1,5 @@ --- -deprecations: +upgrade: - | The ``congress`` project is no longer maintained. This has been `retired since Victoria`__ and has not been used by other OpenStack diff --git a/tests/templates/inventory.j2 b/tests/templates/inventory.j2 index ae28601d81..8cd1d2ecc2 100644 --- a/tests/templates/inventory.j2 +++ b/tests/templates/inventory.j2 @@ -215,9 +215,6 @@ control control compute -[congress:children] -control - [panko:children] control @@ -592,16 +589,6 @@ compute [cyborg-conductor:children] cyborg -# Congress -[congress-api:children] -congress - -[congress-datasource:children] -congress - -[congress-policy-engine:children] -congress - # Panko [panko-api:children] panko