openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove nova-consoleauth"

Browse Source
This commit is contained in:
Zuul 2019-06-17 16:28:45 +00:00 committed by Gerrit Code Review
commit 6cae4dedfe
12 changed files with 17 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/inventory/all-in-one
View File

@ -270,9 +270,6 @@ nova
[nova-conductor:children]
nova
[nova-consoleauth:children]
nova
[nova-novncproxy:children]
nova

3
ansible/inventory/multinode
View File

@ -289,9 +289,6 @@ nova
[nova-conductor:children]
nova
[nova-consoleauth:children]
nova
[nova-novncproxy:children]
nova

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

@ -3,7 +3,7 @@
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|monasca-log-api-access|placement-api-access|panko-api-access)$ apache_access
rewriterule2 programname ^(aodh_wsgi_access|barbican-api|zun_api_wsgi_access|vitrage_wsgi_access)$ wsgi_access
rewriterule3 programname ^(nova-api|nova-compute|nova-compute-ironic|nova-conductor|nova-consoleauth|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
rewriterule5 programname ^(neutron-server|neutron-openvswitch-agent|neutron-ns-metadata-proxy|neutron-metadata-agent|neutron-l3-agent|neutron-dhcp-agent)$ openstack_python
rewriterule6 programname ^(magnum-conductor|magnum-api)$ openstack_python

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

@ -13,7 +13,7 @@
</rule>
<rule>
key programname
pattern ^(nova-api|nova-compute|nova-compute-ironic|nova-conductor|nova-consoleauth|nova-manage|nova-novncproxy|nova-scheduler|nova-placement-api|placement-api|privsep-helper)$
pattern ^(nova-api|nova-compute|nova-compute-ironic|nova-conductor|nova-manage|nova-novncproxy|nova-scheduler|nova-placement-api|placement-api|privsep-helper)$
tag openstack_python
</rule>
<rule>

7
ansible/roles/nova/defaults/main.yml
View File

@ -57,13 +57,6 @@ nova_services:
external: false
port: "{{ rdp_port }}"
host_group: "hyperv"
nova-consoleauth:
container_name: "nova_consoleauth"
group: "nova-consoleauth"
image: "{{ nova_consoleauth_image_full }}"
enabled: True
volumes: "{{ nova_consoleauth_default_volumes + nova_consoleauth_extra_volumes }}"
dimensions: "{{ nova_consoleauth_dimensions }}"
nova-novncproxy:
container_name: "nova_novncproxy"
group: "nova-novncproxy"

26
ansible/roles/nova/handlers/main.yml
View File

@ -109,32 +109,6 @@
or policy_overwriting.changed | bool
or nova_scheduler_container.changed | bool
- name: Restart nova-consoleauth container
vars:
service_name: "nova-consoleauth"
service: "{{ nova_services[service_name] }}"
config_json: "{{ config_jsons.results|selectattr('item.key', 'equalto', service_name)|first }}"
nova_conf: "{{ nova_confs.results|selectattr('item.key', 'equalto', service_name)|first }}"
policy_overwriting: "{{ nova_policy_overwriting.results|selectattr('item.key', 'equalto', service_name)|first }}"
nova_consoleauth_container: "{{ check_nova_containers.results|selectattr('item.key', 'equalto', service_name)|first }}"
become: true
kolla_docker:
action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
privileged: "{{ service.privileged | default(False) }}"
volumes: "{{ service.volumes|reject('equalto', '')|list }}"
dimensions: "{{ service.dimensions }}"
when:
- kolla_action != "config"
- inventory_hostname in groups[service.group]
- service.enabled | bool
- config_json.changed | bool
or nova_conf.changed | bool
or policy_overwriting.changed | bool
or nova_consoleauth_container.changed | bool
- name: Restart nova-novncproxy container
vars:
service_name: "nova-novncproxy"

2
ansible/roles/nova/tasks/config.yml
View File

@ -31,7 +31,6 @@
inventory_hostname in groups['compute'] or
inventory_hostname in groups['nova-api'] or
inventory_hostname in groups['nova-conductor'] or
inventory_hostname in groups['nova-consoleauth'] or
inventory_hostname in groups['nova-novncproxy'] or
inventory_hostname in groups['nova-scheduler']
@ -182,7 +181,6 @@
- nova-compute
- nova-compute-ironic
- nova-conductor
- nova-consoleauth
- nova-novncproxy
- nova-serialproxy
- nova-scheduler

7
ansible/roles/nova/tasks/upgrade.yml
View File

@ -19,3 +19,10 @@
- include_tasks: rolling_upgrade.yml
when: nova_enable_rolling_upgrade | bool
# NOTE(jeffrey4l): Remove this task in U cycle.
- name: Remove nova-consoleauth container
become: true
kolla_docker:
action: "remove_container"
name: "nova_consoleauth"

24
ansible/roles/nova/templates/nova-consoleauth.json.j2
View File

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

1
ansible/site.yml
View File

@ -708,7 +708,6 @@
- compute
- nova-api
- nova-conductor
- nova-consoleauth
- nova-novncproxy
- nova-scheduler
- '&enable_nova_True'

8
releasenotes/notes/remove-nova-consoleauth-0f6a327de69e1273.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
The ``nova-consoleauth`` service is no longer deployed. This has been
`deprecated in nova since Rocky`__ and has not been used by other nova
services since.
__ https://specs.openstack.org/openstack/nova-specs/specs/rocky/implemented/convert-consoles-to-objects.html

3
tests/templates/inventory.j2
View File

@ -263,9 +263,6 @@ nova
[nova-conductor:children]
nova
[nova-consoleauth:children]
nova
[nova-novncproxy:children]
nova