diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index cf710fd86..bdc51247f 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -135,8 +135,6 @@ container_images: image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-consoleauth:current-tripleo - image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index d080646d8..0e3e66c58 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -563,7 +563,6 @@ container_images_template: services: - OS::TripleO::Services::NovaApi - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaConsoleauth - OS::TripleO::Services::NovaIronic - OS::TripleO::Services::NovaScheduler - OS::TripleO::Services::NovaVncProxy @@ -593,13 +592,6 @@ container_images_template: services: - OS::TripleO::Services::NovaConductor -- imagename: "{{namespace}}/{{name_prefix}}nova-consoleauth{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - DockerNovaConsoleauthImage - services: - - OS::TripleO::Services::NovaConsoleauth - - imagename: "{{namespace}}/{{name_prefix}}nova-libvirt{{name_suffix}}:{{tag}}" image_source: kolla params: diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 1d7f81ab4..62193d6a2 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -548,12 +548,6 @@ RUN mkdir -p /openstack && \ chmod a+rx /openstack/healthcheck {% endblock %} -{% block nova_consoleauth_footer %} -RUN mkdir -p /openstack && \ - ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-consoleauth /openstack/healthcheck && \ - chmod a+rx /openstack/healthcheck -{% endblock %} - {% block nova_libvirt_footer %} RUN mkdir -p /openstack && \ ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-libvirt /openstack/healthcheck && \ diff --git a/healthcheck/nova-consoleauth b/healthcheck/nova-consoleauth deleted file mode 100755 index aa615bb74..000000000 --- a/healthcheck/nova-consoleauth +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh - -process='nova-consoleauth' -args="${@:-5671 5672}" - -if healthcheck_port $process $args; then - exit 0 -else - ports=${args// /,} - echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container" - exit 1 -fi diff --git a/releasenotes/notes/nova_remove_nova-consoleauth-95df6d63822ef787.yaml b/releasenotes/notes/nova_remove_nova-consoleauth-95df6d63822ef787.yaml new file mode 100644 index 000000000..cb94de095 --- /dev/null +++ b/releasenotes/notes/nova_remove_nova-consoleauth-95df6d63822ef787.yaml @@ -0,0 +1,15 @@ +--- +fixes: + - | + As of Rocky [1], the nova-consoleauth service has been deprecated and + cell databases are used for storing token authorizations. All new consoles + will be supported by the database backend and existing consoles will be + reset. Console proxies must be run per cell because the new console token + authorizations are stored in cell databases. + + nova-consoleauth was deprecated in tripleo with: + I68485a6c4da4476d07ec0ab5e7b5a4c528820a4f + + This change now removes the NovaConsoleauth Service. + + [1] https://docs.openstack.org/releasenotes/nova/rocky.html