From 2ee6de2b7019e3e2c1ab9a10ddb66a25c0cf262b Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Wed, 6 Feb 2019 12:55:15 +0000
Subject: [PATCH] nova: Remove nova-placement images and healthchecks

Depends-On: https://review.opendev.org/#/c/635141/
Change-Id: Ifcd14227d491001ab7d457e1abd54948b2d61c53
---
 container-images/overcloud_containers.yaml           | 2 --
 container-images/overcloud_containers.yaml.j2        | 8 --------
 container-images/tripleo_kolla_template_overrides.j2 | 6 ------
 healthcheck/nova-placement                           | 6 ------
 4 files changed, 22 deletions(-)
 delete mode 100755 healthcheck/nova-placement

diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index c079dd6be..d5cf5caa3 100644
--- a/container-images/overcloud_containers.yaml
+++ b/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
diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2
index a5bda56ae..00657521c 100644
--- a/container-images/overcloud_containers.yaml.j2
+++ b/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:
diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index af0e2d6f8..79fe24fc4 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/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 \
diff --git a/healthcheck/nova-placement b/healthcheck/nova-placement
deleted file mode 100755
index ef0e05fe6..000000000
--- a/healthcheck/nova-placement
+++ /dev/null
@@ -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}