Merge "nova: Remove nova-placement images and healthchecks"

container-images/overcloud_containers.yaml

@@ -141,8 +141,6 @@ container_images:
   image_source: kolla
 - imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo
   image_source: kolla
-- imagename: docker.io/tripleomaster/centos-binary-nova-placement-api:current-tripleo
-  image_source: kolla
 - imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo
   image_source: kolla
 - imagename: docker.io/tripleomaster/centos-binary-nova-serialproxy:current-tripleo

container-images/overcloud_containers.yaml.j2

@@ -614,14 +614,6 @@ container_images_template:
   services:
   - OS::TripleO::Services::NovaVncProxy
 
-- imagename: "{{namespace}}/{{name_prefix}}nova-placement-api{{name_suffix}}:{{tag}}"
-  image_source: kolla
-  params:
-  - DockerNovaPlacementConfigImage
-  - DockerNovaPlacementImage
-  services:
-  - OS::TripleO::Services::NovaPlacement
-
 - imagename: "{{namespace}}/{{name_prefix}}nova-scheduler{{name_suffix}}:{{tag}}"
   image_source: kolla
   params:

container-images/tripleo_kolla_template_overrides.j2

@@ -578,12 +578,6 @@ RUN mkdir -p /openstack && \
     chmod a+rx /openstack/healthcheck
 {% endblock %}
 
-{% block nova_placement_api_footer %}
-RUN mkdir -p /openstack && \
-    ln -s /usr/share/openstack-tripleo-common/healthcheck/nova-placement /openstack/healthcheck && \
-    chmod a+rx /openstack/healthcheck
-{% endblock %}
-
 {% block octavia_api_footer %}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf \

healthcheck/nova-placement

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
-
-check_url=$(get_url_from_vhost /etc/httpd/conf.d/10-placement_wsgi.conf)
-healthcheck_curl ${check_url}