From cd1a4523edca9d06e849dfb95f7058d5177492ae Mon Sep 17 00:00:00 2001
From: Numan Siddique <nusiddiq@redhat.com>
Date: Wed, 2 Aug 2017 12:03:56 +0530
Subject: [PATCH] Add OVN images to the overcloud containers

This patch
 - adds neutron-server-ovn image to the overcloud containers

 - adds pacemaker packages to ovn_northd image - In order to deploy
   OVN DB servers using pacemaker bundle we need the pacemaker packages

 - also renames the OVN related parameters in overcloud_containers.yaml.j2
   i.e s/OVN/Ovn. The reason for this is tools/validate_yaml.py is expecting
   DockerOvnControllerConfigImage instead of DockerOVNControllerConfigImage

Partial-bug: #1699085
Change-Id: Idb6edc42ac44c8cddd1f1eba6a93b078f755386b
---
 container-images/overcloud_containers.yaml        |  1 +
 container-images/overcloud_containers.yaml.j2     | 15 ++++++++++-----
 .../tripleo_kolla_template_overrides.j2           |  4 ++++
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml
index 2e8aa5737..1ab897d98 100644
--- a/container-images/overcloud_containers.yaml
+++ b/container-images/overcloud_containers.yaml
@@ -50,6 +50,7 @@ container_images:
 - imagename: tripleoupstream/centos-binary-neutron-openvswitch-agent:latest
 - imagename: tripleoupstream/centos-binary-neutron-sriov-agent:latest
 - imagename: tripleoupstream/centos-binary-neutron-server:latest
+- imagename: tripleoupstream/centos-binary-neutron-server-ovn:latest
 - imagename: tripleoupstream/centos-binary-nova-api:latest
 - imagename: tripleoupstream/centos-binary-nova-base:latest
 - imagename: tripleoupstream/centos-binary-nova-compute-ironic:latest
diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2
index a9cd77577..586c14b32 100644
--- a/container-images/overcloud_containers.yaml.j2
+++ b/container-images/overcloud_containers.yaml.j2
@@ -229,6 +229,11 @@ container_images_template:
   - DockerNeutronApiImage
   - DockerNeutronConfigImage
 
+- imagename: "{{namespace}}/{{name_prefix}}neutron-server-ovn{{name_suffix}}:{{tag}}"
+  params:
+  - DockerNeutronOvnApiImage
+  - DockerNeutronOvnConfigImage
+
 - imagename: "{{namespace}}/{{name_prefix}}nova-api{{name_suffix}}:{{tag}}"
   params:
   - DockerNovaApiImage
@@ -294,20 +299,20 @@ container_images_template:
 
 - imagename: "{{namespace}}/{{name_prefix}}ovn-controller{{name_suffix}}:{{tag}}"
   params:
-  - DockerOVNControllerConfigImage
-  - DockerOVNControllerImage
+  - DockerOvnControllerConfigImage
+  - DockerOvnControllerImage
 
 - imagename: "{{namespace}}/{{name_prefix}}ovn-nb-db-server{{name_suffix}}:{{tag}}"
   params:
-  - DockerOVNNbDbImage
+  - DockerOvnNbDbImage
 
 - imagename: "{{namespace}}/{{name_prefix}}ovn-northd{{name_suffix}}:{{tag}}"
   params:
-  - DockerOVNNorthdImage
+  - DockerOvnNorthdImage
 
 - imagename: "{{namespace}}/{{name_prefix}}ovn-sb-db-server{{name_suffix}}:{{tag}}"
   params:
-  - DockerOVNSbDbImage
+  - DockerOvnSbDbImage
 
 - imagename: "{{namespace}}/{{name_prefix}}panko-api{{name_suffix}}:{{tag}}"
   params:
diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index 78d26176a..305819a42 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -380,6 +380,10 @@ RUN mkdir -p /openstack && \
 HEALTHCHECK CMD /openstack/healthcheck
 {% endblock %}
 
+{% block ovn_northd_footer %}
+RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
+{% endblock %}
+
 {% block base_footer %}
 # workaround LP1696283
 RUN mkdir -p /etc/ssh && touch /etc/ssh/ssh_known_hosts