Merge "Remove support for panko"

README.rst

@@ -64,7 +64,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `Neutron <https://docs.openstack.org/neutron/latest/>`__
 - `Nova <https://docs.openstack.org/nova/latest/>`__
 - `Octavia <https://docs.openstack.org/octavia/latest/>`__
-- `Panko <https://docs.openstack.org/panko/latest/>`__
 - `Rally <https://docs.openstack.org/rally/latest/>`__
 - `Sahara <https://docs.openstack.org/sahara/latest/>`__
 - `Senlin <https://docs.openstack.org/senlin/latest/>`__

ansible/group_vars/all.yml

@@ -422,8 +422,6 @@ outward_rabbitmq_epmd_port: "4371"
 
 ovsdb_port: "6640"
 
-panko_api_port: "8977"
-
 placement_internal_fqdn: "{{ kolla_internal_fqdn }}"
 placement_external_fqdn: "{{ kolla_external_fqdn }}"
 # Default Placement API port of 8778 already in use
@@ -671,7 +669,6 @@ enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linux
 enable_ovn: "{{ enable_neutron | bool and neutron_plugin_agent == 'ovn' }}"
 enable_ovs_dpdk: "no"
 enable_osprofiler: "no"
-enable_panko: "no"
 enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
 enable_prometheus: "no"
 enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"

ansible/inventory/all-in-one

@@ -171,9 +171,6 @@ control
 [manila:children]
 control
 
-[panko:children]
-control
-
 [gnocchi:children]
 control
 
@@ -538,10 +535,6 @@ compute
 [cyborg-conductor:children]
 cyborg
 
-# Panko
-[panko-api:children]
-panko
-
 # Gnocchi
 [gnocchi-api:children]
 gnocchi

ansible/inventory/multinode

@@ -199,9 +199,6 @@ control
 control
 compute
 
-[panko:children]
-control
-
 [gnocchi:children]
 control
 
@@ -566,10 +563,6 @@ compute
 [cyborg-conductor:children]
 cyborg
 
-# Panko
-[panko-api:children]
-panko
-
 # Gnocchi
 [gnocchi-api:children]
 gnocchi

ansible/roles/ceilometer/tasks/config.yml

@@ -338,29 +338,6 @@
   notify:
     - "Restart {{ item.key }} container"
 
-- name: Copying over panko.conf
-  vars:
-    service_require_panko_conf:
-      - ceilometer-notification
-  merge_configs:
-    sources:
-      - "{{ role_path }}/../panko/templates/panko.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/panko.conf"
-      - "{{ node_custom_config }}/panko/panko.conf"
-      - "{{ node_custom_config }}/panko/{{ inventory_hostname }}/panko.conf"
-    dest: "{{ node_config_directory }}/{{ item.key }}/panko.conf"
-    mode: "0660"
-  become: true
-  when:
-    - enable_panko | bool
-    - item.value.enabled | bool
-    - inventory_hostname in groups[item.value.group]
-    - item.key in service_require_panko_conf
-  with_dict: "{{ ceilometer_services }}"
-  notify:
-    - "Restart {{ item.key }} container"
-
 - name: Copying VMware vCenter CA file
   become: true
   vars:

ansible/roles/ceilometer/templates/ceilometer-notification.json.j2

@@ -42,14 +42,7 @@
             "dest": "/etc/ceilometer/{{ ceilometer_policy_file }}",
             "owner": "ceilometer",
             "perm": "0600"
-        }{% endif %},
-        {
-            "source": "{{ container_config_directory }}/panko.conf",
-            "dest": "/etc/panko/panko.conf",
-            "owner": "ceilometer",
-            "perm": "0600",
-            "optional": true
-        }
+        }{% endif %}
     ],
     "permissions": [
         {

ansible/roles/ceilometer/templates/event_pipeline.yaml.j2

@@ -11,6 +11,3 @@ sinks:
 {% if enable_gnocchi | bool %}
           - gnocchi://
 {% endif %}
-{% if enable_panko | bool %}
-          - panko://
-{% endif %}

ansible/roles/common/defaults/main.yml

@@ -159,8 +159,6 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_nova | bool }}"
   - name: octavia
     enabled: "{{ enable_octavia | bool }}"
-  - name: panko
-    enabled: "{{ enable_panko | bool }}"
   - name: rally
     enabled: "{{ enable_rally | bool }}"
   - name: sahara

ansible/roles/common/tasks/config.yml

@@ -208,7 +208,6 @@
       - { name: "nova", enabled: "{{ enable_nova | bool }}" }
       - { name: "octavia", enabled: "{{ enable_octavia | bool }}" }
       - { name: "outward-rabbitmq", enabled: "{{ enable_outward_rabbitmq | bool }}" }
-      - { name: "panko", enabled: "{{ enable_panko | bool }}" }
       - { name: "rabbitmq", enabled: "{{ enable_rabbitmq | bool }}" }
       - { name: "rally", enabled: "{{ enable_rally | bool }}" }
       - { name: "sahara", enabled: "{{ enable_sahara | bool }}" }

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

 <match kolla.var.log.kolla.*.*.log>
     @type rewrite_tag_filter
     capitalize_regex_backreference yes
-    rewriterule1 programname ^(cinder-api-access|cloudkitty-api-access|gnocchi-api-access|horizon-access|keystone-apache-admin-access|keystone-apache-public-access|monasca-api-access|octavia-api-access|placement-api-access|panko-api-access)$ apache_access
+    rewriterule1 programname ^(cinder-api-access|cloudkitty-api-access|gnocchi-api-access|horizon-access|keystone-apache-admin-access|keystone-apache-public-access|monasca-api-access|octavia-api-access|placement-api-access)$ apache_access
     rewriterule2 programname ^(aodh_wsgi_access|barbican_api_uwsgi_access|zun_api_wsgi_access|vitrage_wsgi_access)$ wsgi_access
     rewriterule3 programname ^(nova-api|nova-compute|nova-compute-ironic|nova-conductor|nova-manage|nova-novncproxy|nova-scheduler|nova-placement-api|placement-api|privsep-helper)$ openstack_python
     rewriterule4 programname ^(sahara-api|sahara-engine)$ openstack_python
@@ -28,7 +28,6 @@
     rewriterule26 programname ^(kuryr-server)$ openstack_python
     rewriterule27 programname ^(gnocchi-api|gnocchi-statsd|gnocchi-metricd|gnocchi-upgrade)$ openstack_python
     rewriterule28 programname ^(ironic-api|ironic-conductor|ironic-inspector)$ openstack_python
-    rewriterule29 programname ^(panko-api|panko-dbsync)$ openstack_python
     rewriterule30 programname ^(tacker-server|tacker-conductor)$ openstack_python
     rewriterule31 programname ^(vitrage-ml|vitrage-notifier|vitrage-graph|vitrage-persistor)$ openstack_python
     rewriterule32 programname ^(blazar-api|blazar-manager)$ openstack_python

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

@@ -3,7 +3,7 @@
     capitalize_regex_backreference yes
   <rule>
     key     programname
-    pattern ^(cinder-api-access|cloudkitty-api-access|gnocchi-api-access|horizon-access|keystone-apache-admin-access|keystone-apache-public-access|monasca-api-access|octavia-api-access|placement-api-access|panko-api-access)$
+    pattern ^(cinder-api-access|cloudkitty-api-access|gnocchi-api-access|horizon-access|keystone-apache-admin-access|keystone-apache-public-access|monasca-api-access|octavia-api-access|placement-api-access)$
     tag apache_access
   </rule>
   <rule>
@@ -141,11 +141,6 @@
     pattern ^(ironic-api|ironic-conductor|ironic-inspector)$
     tag openstack_python
   </rule>
-  <rule>
-    key     programname
-    pattern ^(panko-api|panko-dbsync)$
-    tag openstack_python
-  </rule>
   <rule>
     key     programname
     pattern ^(tacker-server|tacker-conductor)$

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

-"/var/log/kolla/panko/*.log"
-{
-}

ansible/roles/haproxy/tasks/precheck.yml

@@ -684,19 +684,6 @@
     - haproxy_stat.find('octavia_api') == -1
     - haproxy_vip_prechecks
 
-- name: Checking free port for Panko API HAProxy
-  wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ panko_api_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - enable_panko | bool
-    - inventory_hostname in groups['haproxy']
-    - haproxy_stat.find('panko_api') == -1
-    - haproxy_vip_prechecks
-
 - name: Checking free port for RabbitMQ Management HAProxy
   wait_for:
     host: "{{ kolla_internal_vip_address }}"

ansible/roles/panko/defaults/main.yml

----
-project_name: "panko"
-
-panko_services:
-  panko-api:
-    container_name: panko_api
-    group: panko-api
-    enabled: true
-    image: "{{ panko_api_image_full }}"
-    volumes: "{{ panko_api_default_volumes + panko_api_extra_volumes }}"
-    dimensions: "{{ panko_api_dimensions }}"
-    haproxy:
-      panko_api:
-        enabled: "{{ enable_panko }}"
-        mode: "http"
-        external: false
-        port: "{{ panko_api_port }}"
-      panko_api_external:
-        enabled: "{{ enable_panko }}"
-        mode: "http"
-        external: true
-        port: "{{ panko_api_port }}"
-
-
-####################
-# Database
-####################
-panko_database_name: "panko"
-panko_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}panko{% endif %}"
-panko_database_mysql_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}"
-
-####################
-# Docker
-####################
-panko_install_type: "{{ kolla_install_type }}"
-panko_tag: "{{ openstack_tag }}"
-
-panko_api_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ panko_install_type }}-panko-api"
-panko_api_tag: "{{ panko_tag }}"
-panko_api_image_full: "{{ panko_api_image }}:{{ panko_api_tag }}"
-panko_api_dimensions: "{{ default_container_dimensions }}"
-
-panko_api_default_volumes:
-  - "{{ node_config_directory }}/panko-api/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ '/etc/timezone:/etc/timezone:ro' if ansible_os_family == 'Debian' else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-panko_api_extra_volumes: "{{ default_extra_volumes }}"
-
-####################
-# OpenStack
-####################
-panko_admin_endpoint: "{{ admin_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ panko_api_port }}"
-panko_internal_endpoint: "{{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ panko_api_port }}"
-panko_public_endpoint: "{{ public_protocol }}://{{ kolla_external_fqdn | put_address_in_context('url') }}:{{ panko_api_port }}"
-
-panko_logging_debug: "{{ openstack_logging_debug }}"
-
-panko_keystone_user: "panko"
-
-openstack_panko_auth: "{{ openstack_auth }}"
-
-####################
-# Keystone
-####################
-panko_ks_services:
-  - name: "panko"
-    type: "event"
-    description: "Panko Service"
-    endpoints:
-      - {'interface': 'admin', 'url': '{{ panko_admin_endpoint }}'}
-      - {'interface': 'internal', 'url': '{{ panko_internal_endpoint }}'}
-      - {'interface': 'public', 'url': '{{ panko_public_endpoint }}'}
-
-panko_ks_users:
-  - project: "service"
-    user: "{{ panko_keystone_user }}"
-    password: "{{ panko_keystone_password }}"
-    role: "admin"

ansible/roles/panko/handlers/main.yml

----
-- name: Restart panko-api container
-  vars:
-    service_name: "panko-api"
-    service: "{{ panko_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 }}"
-    dimensions: "{{ service.dimensions }}"
-  when:
-    - kolla_action != "config"

ansible/roles/panko/tasks/bootstrap.yml

----
-- name: Creating Panko mysql 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: "{{ panko_database_name }}"
-  run_once: True
-  delegate_to: "{{ groups['panko-api'][0] }}"
-  when:
-    - not use_preconfigured_databases | bool
-
-- name: Creating Panko mysql 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: "{{ panko_database_user }}"
-      password: "{{ panko_database_password }}"
-      host: "%"
-      priv: "{{ panko_database_name }}.*:ALL"
-      append_privs: "yes"
-  run_once: True
-  delegate_to: "{{ groups['panko-api'][0] }}"
-  when:
-    - not use_preconfigured_databases | bool
-
-- import_tasks: bootstrap_service.yml

ansible/roles/panko/tasks/bootstrap_service.yml

----
-- name: Running panko bootstrap container
-  vars:
-    panko_api: "{{ panko_services['panko-api'] }}"
-  become: true
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ panko_api.image }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_panko"
-    restart_policy: no
-    volumes: "{{ panko_api.volumes }}"
-  run_once: True
-  delegate_to: "{{ groups[panko_api.group][0] }}"

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

----
-- name: Check panko 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 }}"
-    dimensions: "{{ item.value.dimensions }}"
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ panko_services }}"
-  notify:
-    - "Restart {{ item.key }} container"

ansible/roles/panko/tasks/check.yml

----

ansible/roles/panko/tasks/config.yml

----
-- 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: "{{ panko_services }}"
-
-- name: Check if policies shall be overwritten
-  stat:
-    path: "{{ item }}"
-  delegate_to: localhost
-  run_once: True
-  register: panko_policy
-  with_first_found:
-    - files: "{{ supported_policy_format_list }}"
-      paths:
-        - "{{ node_custom_config }}/panko/"
-      skip: true
-
-- name: Set panko policy file
-  set_fact:
-    panko_policy_file: "{{ panko_policy.results.0.stat.path | basename }}"
-    panko_policy_file_path: "{{ panko_policy.results.0.stat.path }}"
-  when:
-    - panko_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: "{{ panko_services }}"
-  notify:
-    - Restart panko-api container
-
-- name: Copying over panko.conf
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/panko.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/panko.conf"
-      - "{{ node_custom_config }}/panko/{{ item.key }}.conf"
-      - "{{ node_custom_config }}/panko/{{ inventory_hostname }}/{{ item.key }}.conf"
-    dest: "{{ node_config_directory }}/{{ item.key }}/panko.conf"
-    mode: "0660"
-  become: true
-  when:
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ panko_services }}"
-  notify:
-    - Restart panko-api container
-
-- name: Copying over wsgi-panko files for services
-  vars:
-    service: "{{ panko_services['panko-api'] }}"
-  template:
-    src: "wsgi-panko.conf.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/wsgi-panko.conf"
-    mode: "0660"
-  become: true
-  when:
-    - inventory_hostname in groups[service.group]
-    - service.enabled | bool
-  with_items:
-    - "panko-api"
-  notify:
-    - Restart panko-api container
-
-- name: Copying over existing policy file
-  template:
-    src: "{{ panko_policy_file_path }}"
-    dest: "{{ node_config_directory }}/{{ item.key }}/{{ panko_policy_file }}"
-    mode: "0660"
-  become: true
-  when:
-    - panko_policy_file is defined
-    - inventory_hostname in groups[item.value.group]
-    - item.value.enabled | bool
-  with_dict: "{{ panko_services }}"
-  notify:
-    - Restart panko-api container