Merge "Remove support for panko"
This commit is contained in:
commit
4dcea739d5
@ -64,7 +64,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
|
|||||||
- `Neutron <https://docs.openstack.org/neutron/latest/>`__
|
- `Neutron <https://docs.openstack.org/neutron/latest/>`__
|
||||||
- `Nova <https://docs.openstack.org/nova/latest/>`__
|
- `Nova <https://docs.openstack.org/nova/latest/>`__
|
||||||
- `Octavia <https://docs.openstack.org/octavia/latest/>`__
|
- `Octavia <https://docs.openstack.org/octavia/latest/>`__
|
||||||
- `Panko <https://docs.openstack.org/panko/latest/>`__
|
|
||||||
- `Rally <https://docs.openstack.org/rally/latest/>`__
|
- `Rally <https://docs.openstack.org/rally/latest/>`__
|
||||||
- `Sahara <https://docs.openstack.org/sahara/latest/>`__
|
- `Sahara <https://docs.openstack.org/sahara/latest/>`__
|
||||||
- `Senlin <https://docs.openstack.org/senlin/latest/>`__
|
- `Senlin <https://docs.openstack.org/senlin/latest/>`__
|
||||||
|
@ -422,8 +422,6 @@ outward_rabbitmq_epmd_port: "4371"
|
|||||||
|
|
||||||
ovsdb_port: "6640"
|
ovsdb_port: "6640"
|
||||||
|
|
||||||
panko_api_port: "8977"
|
|
||||||
|
|
||||||
placement_internal_fqdn: "{{ kolla_internal_fqdn }}"
|
placement_internal_fqdn: "{{ kolla_internal_fqdn }}"
|
||||||
placement_external_fqdn: "{{ kolla_external_fqdn }}"
|
placement_external_fqdn: "{{ kolla_external_fqdn }}"
|
||||||
# Default Placement API port of 8778 already in use
|
# 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_ovn: "{{ enable_neutron | bool and neutron_plugin_agent == 'ovn' }}"
|
||||||
enable_ovs_dpdk: "no"
|
enable_ovs_dpdk: "no"
|
||||||
enable_osprofiler: "no"
|
enable_osprofiler: "no"
|
||||||
enable_panko: "no"
|
|
||||||
enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
|
enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
|
||||||
enable_prometheus: "no"
|
enable_prometheus: "no"
|
||||||
enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
|
enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
|
||||||
|
@ -171,9 +171,6 @@ control
|
|||||||
[manila:children]
|
[manila:children]
|
||||||
control
|
control
|
||||||
|
|
||||||
[panko:children]
|
|
||||||
control
|
|
||||||
|
|
||||||
[gnocchi:children]
|
[gnocchi:children]
|
||||||
control
|
control
|
||||||
|
|
||||||
@ -538,10 +535,6 @@ compute
|
|||||||
[cyborg-conductor:children]
|
[cyborg-conductor:children]
|
||||||
cyborg
|
cyborg
|
||||||
|
|
||||||
# Panko
|
|
||||||
[panko-api:children]
|
|
||||||
panko
|
|
||||||
|
|
||||||
# Gnocchi
|
# Gnocchi
|
||||||
[gnocchi-api:children]
|
[gnocchi-api:children]
|
||||||
gnocchi
|
gnocchi
|
||||||
|
@ -199,9 +199,6 @@ control
|
|||||||
control
|
control
|
||||||
compute
|
compute
|
||||||
|
|
||||||
[panko:children]
|
|
||||||
control
|
|
||||||
|
|
||||||
[gnocchi:children]
|
[gnocchi:children]
|
||||||
control
|
control
|
||||||
|
|
||||||
@ -566,10 +563,6 @@ compute
|
|||||||
[cyborg-conductor:children]
|
[cyborg-conductor:children]
|
||||||
cyborg
|
cyborg
|
||||||
|
|
||||||
# Panko
|
|
||||||
[panko-api:children]
|
|
||||||
panko
|
|
||||||
|
|
||||||
# Gnocchi
|
# Gnocchi
|
||||||
[gnocchi-api:children]
|
[gnocchi-api:children]
|
||||||
gnocchi
|
gnocchi
|
||||||
|
@ -338,29 +338,6 @@
|
|||||||
notify:
|
notify:
|
||||||
- "Restart {{ item.key }} container"
|
- "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
|
- name: Copying VMware vCenter CA file
|
||||||
become: true
|
become: true
|
||||||
vars:
|
vars:
|
||||||
|
@ -42,14 +42,7 @@
|
|||||||
"dest": "/etc/ceilometer/{{ ceilometer_policy_file }}",
|
"dest": "/etc/ceilometer/{{ ceilometer_policy_file }}",
|
||||||
"owner": "ceilometer",
|
"owner": "ceilometer",
|
||||||
"perm": "0600"
|
"perm": "0600"
|
||||||
}{% endif %},
|
}{% endif %}
|
||||||
{
|
|
||||||
"source": "{{ container_config_directory }}/panko.conf",
|
|
||||||
"dest": "/etc/panko/panko.conf",
|
|
||||||
"owner": "ceilometer",
|
|
||||||
"perm": "0600",
|
|
||||||
"optional": true
|
|
||||||
}
|
|
||||||
],
|
],
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
|
@ -11,6 +11,3 @@ sinks:
|
|||||||
{% if enable_gnocchi | bool %}
|
{% if enable_gnocchi | bool %}
|
||||||
- gnocchi://
|
- gnocchi://
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if enable_panko | bool %}
|
|
||||||
- panko://
|
|
||||||
{% endif %}
|
|
||||||
|
@ -159,8 +159,6 @@ fluentd_input_openstack_services:
|
|||||||
enabled: "{{ enable_nova | bool }}"
|
enabled: "{{ enable_nova | bool }}"
|
||||||
- name: octavia
|
- name: octavia
|
||||||
enabled: "{{ enable_octavia | bool }}"
|
enabled: "{{ enable_octavia | bool }}"
|
||||||
- name: panko
|
|
||||||
enabled: "{{ enable_panko | bool }}"
|
|
||||||
- name: rally
|
- name: rally
|
||||||
enabled: "{{ enable_rally | bool }}"
|
enabled: "{{ enable_rally | bool }}"
|
||||||
- name: sahara
|
- name: sahara
|
||||||
|
@ -208,7 +208,6 @@
|
|||||||
- { name: "nova", enabled: "{{ enable_nova | bool }}" }
|
- { name: "nova", enabled: "{{ enable_nova | bool }}" }
|
||||||
- { name: "octavia", enabled: "{{ enable_octavia | bool }}" }
|
- { name: "octavia", enabled: "{{ enable_octavia | bool }}" }
|
||||||
- { name: "outward-rabbitmq", enabled: "{{ enable_outward_rabbitmq | bool }}" }
|
- { name: "outward-rabbitmq", enabled: "{{ enable_outward_rabbitmq | bool }}" }
|
||||||
- { name: "panko", enabled: "{{ enable_panko | bool }}" }
|
|
||||||
- { name: "rabbitmq", enabled: "{{ enable_rabbitmq | bool }}" }
|
- { name: "rabbitmq", enabled: "{{ enable_rabbitmq | bool }}" }
|
||||||
- { name: "rally", enabled: "{{ enable_rally | bool }}" }
|
- { name: "rally", enabled: "{{ enable_rally | bool }}" }
|
||||||
- { name: "sahara", enabled: "{{ enable_sahara | bool }}" }
|
- { name: "sahara", enabled: "{{ enable_sahara | bool }}" }
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<match kolla.var.log.kolla.*.*.log>
|
<match kolla.var.log.kolla.*.*.log>
|
||||||
@type rewrite_tag_filter
|
@type rewrite_tag_filter
|
||||||
capitalize_regex_backreference yes
|
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
|
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
|
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
|
rewriterule4 programname ^(sahara-api|sahara-engine)$ openstack_python
|
||||||
@ -28,7 +28,6 @@
|
|||||||
rewriterule26 programname ^(kuryr-server)$ openstack_python
|
rewriterule26 programname ^(kuryr-server)$ openstack_python
|
||||||
rewriterule27 programname ^(gnocchi-api|gnocchi-statsd|gnocchi-metricd|gnocchi-upgrade)$ openstack_python
|
rewriterule27 programname ^(gnocchi-api|gnocchi-statsd|gnocchi-metricd|gnocchi-upgrade)$ openstack_python
|
||||||
rewriterule28 programname ^(ironic-api|ironic-conductor|ironic-inspector)$ 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
|
rewriterule30 programname ^(tacker-server|tacker-conductor)$ openstack_python
|
||||||
rewriterule31 programname ^(vitrage-ml|vitrage-notifier|vitrage-graph|vitrage-persistor)$ openstack_python
|
rewriterule31 programname ^(vitrage-ml|vitrage-notifier|vitrage-graph|vitrage-persistor)$ openstack_python
|
||||||
rewriterule32 programname ^(blazar-api|blazar-manager)$ openstack_python
|
rewriterule32 programname ^(blazar-api|blazar-manager)$ openstack_python
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
capitalize_regex_backreference yes
|
capitalize_regex_backreference yes
|
||||||
<rule>
|
<rule>
|
||||||
key programname
|
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
|
tag apache_access
|
||||||
</rule>
|
</rule>
|
||||||
<rule>
|
<rule>
|
||||||
@ -141,11 +141,6 @@
|
|||||||
pattern ^(ironic-api|ironic-conductor|ironic-inspector)$
|
pattern ^(ironic-api|ironic-conductor|ironic-inspector)$
|
||||||
tag openstack_python
|
tag openstack_python
|
||||||
</rule>
|
</rule>
|
||||||
<rule>
|
|
||||||
key programname
|
|
||||||
pattern ^(panko-api|panko-dbsync)$
|
|
||||||
tag openstack_python
|
|
||||||
</rule>
|
|
||||||
<rule>
|
<rule>
|
||||||
key programname
|
key programname
|
||||||
pattern ^(tacker-server|tacker-conductor)$
|
pattern ^(tacker-server|tacker-conductor)$
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
"/var/log/kolla/panko/*.log"
|
|
||||||
{
|
|
||||||
}
|
|
@ -684,19 +684,6 @@
|
|||||||
- haproxy_stat.find('octavia_api') == -1
|
- haproxy_stat.find('octavia_api') == -1
|
||||||
- haproxy_vip_prechecks
|
- 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
|
- name: Checking free port for RabbitMQ Management HAProxy
|
||||||
wait_for:
|
wait_for:
|
||||||
host: "{{ kolla_internal_vip_address }}"
|
host: "{{ kolla_internal_vip_address }}"
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
---
|
|
||||||
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"
|
|
@ -1,15 +0,0 @@
|
|||||||
---
|
|
||||||
- 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"
|
|
@ -1,36 +0,0 @@
|
|||||||
---
|
|
||||||
- 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
|
|
@ -1,20 +0,0 @@
|
|||||||
---
|
|
||||||
- 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] }}"
|
|
@ -1,16 +0,0 @@
|
|||||||
---
|
|
||||||
- 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"
|
|
@ -1 +0,0 @@
|
|||||||
---
|
|
@ -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: "{{ 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
|
|
@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
- name: "Copy certificates and keys for {{ project_name }}"
|
|
||||||
import_role:
|
|
||||||
role: service-cert-copy
|
|
||||||
vars:
|
|
||||||
project_services: "{{ panko_services }}"
|
|
@ -1,2 +0,0 @@
|
|||||||
---
|
|
||||||
- import_tasks: check-containers.yml
|
|
@ -1,11 +0,0 @@
|
|||||||
---
|
|
||||||
- import_tasks: register.yml
|
|
||||||
|
|
||||||
- import_tasks: config.yml
|
|
||||||
|
|
||||||
- import_tasks: check-containers.yml
|
|
||||||
|
|
||||||
- import_tasks: bootstrap.yml
|
|
||||||
|
|
||||||
- name: Flush handlers
|
|
||||||
meta: flush_handlers
|
|
@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
- name: "Configure haproxy for {{ project_name }}"
|
|
||||||
import_role:
|
|
||||||
name: haproxy-config
|
|
||||||
vars:
|
|
||||||
project_services: "{{ panko_services }}"
|
|
||||||
tags: always
|
|
@ -1,2 +0,0 @@
|
|||||||
---
|
|
||||||
- include_tasks: "{{ kolla_action }}.yml"
|
|
@ -1,24 +0,0 @@
|
|||||||
---
|
|
||||||
- import_role:
|
|
||||||
name: service-precheck
|
|
||||||
vars:
|
|
||||||
service_precheck_services: "{{ panko_services }}"
|
|
||||||
service_name: "{{ project_name }}"
|
|
||||||
|
|
||||||
- name: Get container facts
|
|
||||||
become: true
|
|
||||||
kolla_container_facts:
|
|
||||||
name:
|
|
||||||
- panko_api
|
|
||||||
register: container_facts
|
|
||||||
|
|
||||||
- name: Checking free port for Panko API
|
|
||||||
wait_for:
|
|
||||||
host: "{{ api_interface_address }}"
|
|
||||||
port: "{{ panko_api_port }}"
|
|
||||||
connect_timeout: 1
|
|
||||||
timeout: 1
|
|
||||||
state: stopped
|
|
||||||
when:
|
|
||||||
- container_facts['panko_api'] is not defined
|
|
||||||
- inventory_hostname in groups['panko-api']
|
|
@ -1,8 +0,0 @@
|
|||||||
---
|
|
||||||
- name: Pulling panko-api image
|
|
||||||
become: true
|
|
||||||
kolla_docker:
|
|
||||||
action: "pull_image"
|
|
||||||
common_options: "{{ docker_common_options }}"
|
|
||||||
image: "{{ panko_api_image_full }}"
|
|
||||||
when: inventory_hostname in groups['panko-api']
|
|
@ -1,2 +0,0 @@
|
|||||||
---
|
|
||||||
- import_tasks: deploy.yml
|
|
@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
- import_role:
|
|
||||||
name: service-ks-register
|
|
||||||
vars:
|
|
||||||
service_ks_register_auth: "{{ openstack_panko_auth }}"
|
|
||||||
service_ks_register_services: "{{ panko_ks_services }}"
|
|
||||||
service_ks_register_users: "{{ panko_ks_users }}"
|
|
@ -1,6 +0,0 @@
|
|||||||
---
|
|
||||||
- import_role:
|
|
||||||
name: service-stop
|
|
||||||
vars:
|
|
||||||
project_services: "{{ panko_services }}"
|
|
||||||
service_name: "{{ project_name }}"
|
|
@ -1,9 +0,0 @@
|
|||||||
---
|
|
||||||
- import_tasks: config.yml
|
|
||||||
|
|
||||||
- import_tasks: check-containers.yml
|
|
||||||
|
|
||||||
- import_tasks: bootstrap_service.yml
|
|
||||||
|
|
||||||
- name: Flush handlers
|
|
||||||
meta: flush_handlers
|
|
@ -1,32 +0,0 @@
|
|||||||
{% set panko_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
|
|
||||||
{% set panko_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
|
|
||||||
{
|
|
||||||
"command": "{{ panko_cmd }} -DFOREGROUND",
|
|
||||||
"config_files": [
|
|
||||||
{
|
|
||||||
"source": "{{ container_config_directory }}/panko.conf",
|
|
||||||
"dest": "/etc/panko/panko.conf",
|
|
||||||
"owner": "panko",
|
|
||||||
"perm": "0600"
|
|
||||||
}{% if panko_policy_file is defined %},
|
|
||||||
{
|
|
||||||
"source": "{{ container_config_directory }}/{{ panko_policy_file }}",
|
|
||||||
"dest": "/etc/panko/{{ panko_policy_file }}",
|
|
||||||
"owner": "panko",
|
|
||||||
"perm": "0600"
|
|
||||||
}{% endif %},
|
|
||||||
{
|
|
||||||
"source": "{{ container_config_directory }}/wsgi-panko.conf",
|
|
||||||
"dest": "/etc/{{ panko_dir }}/wsgi-panko.conf",
|
|
||||||
"owner": "panko",
|
|
||||||
"perm": "0640"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"permissions": [
|
|
||||||
{
|
|
||||||
"path": "/var/log/kolla/panko",
|
|
||||||
"owner": "panko:panko",
|
|
||||||
"recurse": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -1,37 +0,0 @@
|
|||||||
#jinja2: trim_blocks: False
|
|
||||||
[DEFAULT]
|
|
||||||
log_dir = /var/log/kolla/panko
|
|
||||||
debug = {{ panko_logging_debug }}
|
|
||||||
|
|
||||||
# Force panko-api.log or will use app.wsgi
|
|
||||||
log_file = /var/log/kolla/panko/panko-api.log
|
|
||||||
|
|
||||||
|
|
||||||
[database]
|
|
||||||
connection = mysql+pymysql://{{ panko_database_user }}:{{ panko_database_password }}@{{ panko_database_mysql_address }}/{{ panko_database_name }}
|
|
||||||
connection_recycle_time = {{ database_connection_recycle_time }}
|
|
||||||
max_pool_size = {{ database_max_pool_size }}
|
|
||||||
metering_connection = mysql+pymysql://{{ panko_database_user }}:{{ panko_database_password }}@{{ panko_database_mysql_address }}/{{ panko_database_name }}
|
|
||||||
|
|
||||||
[keystone_authtoken]
|
|
||||||
www_authenticate_uri = {{ keystone_internal_url }}
|
|
||||||
project_domain_name = {{ default_project_domain_name }}
|
|
||||||
project_name = service
|
|
||||||
user_domain_name = {{ default_user_domain_name }}
|
|
||||||
username = {{ panko_keystone_user }}
|
|
||||||
password = {{ panko_keystone_password }}
|
|
||||||
auth_url = {{ keystone_admin_url }}
|
|
||||||
auth_type = 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 %}
|
|
||||||
|
|
||||||
{% if panko_policy_file is defined %}
|
|
||||||
[oslo_policy]
|
|
||||||
policy_file = {{ panko_policy_file }}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
[oslo_middleware]
|
|
||||||
enable_proxy_headers_parsing = True
|
|
@ -1,36 +0,0 @@
|
|||||||
{% set panko_log_dir = '/var/log/kolla/panko' %}
|
|
||||||
{% set binary_path = '/usr/bin' if panko_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
|
|
||||||
Listen {{ api_interface_address | put_address_in_context('url') }}:{{ panko_api_port }}
|
|
||||||
|
|
||||||
ServerSignature Off
|
|
||||||
ServerTokens Prod
|
|
||||||
TraceEnable off
|
|
||||||
TimeOut {{ kolla_httpd_timeout }}
|
|
||||||
KeepAliveTimeout {{ kolla_httpd_keep_alive }}
|
|
||||||
|
|
||||||
ErrorLog "{{ panko_log_dir }}/apache-error.log"
|
|
||||||
<IfModule log_config_module>
|
|
||||||
CustomLog "{{ panko_log_dir }}/apache-access.log" common
|
|
||||||
</IfModule>
|
|
||||||
|
|
||||||
{% if panko_logging_debug | bool %}
|
|
||||||
LogLevel info
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<Directory "{{ binary_path }}">
|
|
||||||
<FilesMatch "^panko-api$">
|
|
||||||
Require all granted
|
|
||||||
</FilesMatch>
|
|
||||||
</Directory>
|
|
||||||
|
|
||||||
<VirtualHost *:{{ panko_api_port }}>
|
|
||||||
|
|
||||||
ErrorLog "{{ panko_log_dir }}/panko-api-error.log"
|
|
||||||
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
|
|
||||||
CustomLog "{{ panko_log_dir }}/panko-api-access.log" logformat
|
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
|
||||||
WSGIDaemonProcess panko group=panko processes={{ openstack_service_workers }} threads=1 user=panko
|
|
||||||
WSGIProcessGroup panko
|
|
||||||
WSGIScriptAlias / "{{ binary_path }}/panko-api"
|
|
||||||
|
|
||||||
</VirtualHost>
|
|
@ -60,7 +60,6 @@
|
|||||||
- enable_openvswitch_{{ enable_openvswitch | bool }}_enable_ovs_dpdk_{{ enable_ovs_dpdk | bool }}
|
- enable_openvswitch_{{ enable_openvswitch | bool }}_enable_ovs_dpdk_{{ enable_ovs_dpdk | bool }}
|
||||||
- enable_outward_rabbitmq_{{ enable_outward_rabbitmq | bool }}
|
- enable_outward_rabbitmq_{{ enable_outward_rabbitmq | bool }}
|
||||||
- enable_ovn_{{ enable_ovn | bool }}
|
- enable_ovn_{{ enable_ovn | bool }}
|
||||||
- enable_panko_{{ enable_panko | bool }}
|
|
||||||
- enable_placement_{{ enable_placement | bool }}
|
- enable_placement_{{ enable_placement | bool }}
|
||||||
- enable_prometheus_{{ enable_prometheus | bool }}
|
- enable_prometheus_{{ enable_prometheus | bool }}
|
||||||
- enable_qdrouterd_{{ enable_qdrouterd | bool }}
|
- enable_qdrouterd_{{ enable_qdrouterd | bool }}
|
||||||
@ -287,11 +286,6 @@
|
|||||||
tasks_from: loadbalancer
|
tasks_from: loadbalancer
|
||||||
tags: octavia
|
tags: octavia
|
||||||
when: enable_octavia | bool
|
when: enable_octavia | bool
|
||||||
- include_role:
|
|
||||||
name: panko
|
|
||||||
tasks_from: loadbalancer
|
|
||||||
tags: panko
|
|
||||||
when: enable_panko | bool
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: prometheus
|
name: prometheus
|
||||||
tasks_from: loadbalancer
|
tasks_from: loadbalancer
|
||||||
@ -834,17 +828,6 @@
|
|||||||
tags: sahara,
|
tags: sahara,
|
||||||
when: enable_sahara | bool }
|
when: enable_sahara | bool }
|
||||||
|
|
||||||
- name: Apply role panko
|
|
||||||
gather_facts: false
|
|
||||||
hosts:
|
|
||||||
- panko-api
|
|
||||||
- '&enable_panko_True'
|
|
||||||
serial: '{{ kolla_serial|default("0") }}'
|
|
||||||
roles:
|
|
||||||
- { role: panko,
|
|
||||||
tags: panko,
|
|
||||||
when: enable_panko | bool }
|
|
||||||
|
|
||||||
- name: Apply role manila
|
- name: Apply role manila
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
hosts:
|
hosts:
|
||||||
@ -874,8 +857,6 @@
|
|||||||
|
|
||||||
- name: Apply role ceilometer
|
- name: Apply role ceilometer
|
||||||
gather_facts: false
|
gather_facts: false
|
||||||
vars_files:
|
|
||||||
- "roles/panko/defaults/main.yml"
|
|
||||||
hosts:
|
hosts:
|
||||||
- ceilometer-central
|
- ceilometer-central
|
||||||
- ceilometer-notification
|
- ceilometer-notification
|
||||||
|
@ -364,7 +364,6 @@
|
|||||||
#enable_ovn: "{{ enable_neutron | bool and neutron_plugin_agent == 'ovn' }}"
|
#enable_ovn: "{{ enable_neutron | bool and neutron_plugin_agent == 'ovn' }}"
|
||||||
#enable_ovs_dpdk: "no"
|
#enable_ovs_dpdk: "no"
|
||||||
#enable_osprofiler: "no"
|
#enable_osprofiler: "no"
|
||||||
#enable_panko: "no"
|
|
||||||
#enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
|
#enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
|
||||||
#enable_prometheus: "no"
|
#enable_prometheus: "no"
|
||||||
#enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
|
#enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
|
||||||
|
@ -93,9 +93,6 @@ cloudkitty_keystone_password:
|
|||||||
cyborg_database_password:
|
cyborg_database_password:
|
||||||
cyborg_keystone_password:
|
cyborg_keystone_password:
|
||||||
|
|
||||||
panko_database_password:
|
|
||||||
panko_keystone_password:
|
|
||||||
|
|
||||||
freezer_database_password:
|
freezer_database_password:
|
||||||
freezer_keystone_password:
|
freezer_keystone_password:
|
||||||
|
|
||||||
|
@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
Support for panko has been removed due to upstream retirement.
|
@ -251,9 +251,6 @@ control
|
|||||||
control
|
control
|
||||||
compute
|
compute
|
||||||
|
|
||||||
[panko:children]
|
|
||||||
control
|
|
||||||
|
|
||||||
[gnocchi:children]
|
[gnocchi:children]
|
||||||
control
|
control
|
||||||
|
|
||||||
@ -618,10 +615,6 @@ compute
|
|||||||
[cyborg-conductor:children]
|
[cyborg-conductor:children]
|
||||||
cyborg
|
cyborg
|
||||||
|
|
||||||
# Panko
|
|
||||||
[panko-api:children]
|
|
||||||
panko
|
|
||||||
|
|
||||||
# Gnocchi
|
# Gnocchi
|
||||||
[gnocchi-api:children]
|
[gnocchi-api:children]
|
||||||
gnocchi
|
gnocchi
|
||||||
|
Loading…
Reference in New Issue
Block a user