Merge "Add OVN Metadata Agent to containerized environments"

container-images/overcloud_containers.yaml

@@ -56,6 +56,7 @@ container_images:
 - imagename: docker.io/tripleoupstream/centos-binary-neutron-server:latest
 - imagename: docker.io/tripleoupstream/centos-binary-neutron-server-opendaylight:latest
 - imagename: docker.io/tripleoupstream/centos-binary-neutron-server-ovn:latest
+- imagename: docker.io/tripleoupstream/centos-binary-neutron-metadata-agent-ovn:latest
 - imagename: docker.io/tripleoupstream/centos-binary-nova-api:latest
 - imagename: docker.io/tripleoupstream/centos-binary-nova-compute-ironic:latest
 - imagename: docker.io/tripleoupstream/centos-binary-nova-compute:latest

container-images/overcloud_containers.yaml.j2

@@ -410,6 +410,12 @@ container_images_template:
   - OS::TripleO::Services::NeutronApi
   - OS::TripleO::Services::NeutronServer
 
+- imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent-ovn{{name_suffix}}:{{tag}}"
+  params:
+  - DockerOvnMetadataImage
+  services:
+  - OS::TripleO::Services::OVNMetadataAgent
+
 {% else %}
 - imagename: "{{namespace}}/{{name_prefix}}neutron-server{{name_suffix}}:{{tag}}"
   params:

container-images/tripleo_kolla_template_overrides.j2

@@ -402,6 +402,12 @@ RUN mkdir -p /openstack && \
 RUN yum install -y pacemaker pacemaker-remote pcs libqb resource-agents && mkdir /etc/libqb
 {% endblock %}
 
+{% block ovn_metadata_agent_footer %}
+RUN mkdir -p /openstack && \
+    ln -s /usr/share/openstack-tripleo-common/healthcheck/ovn-metadata /openstack/healthcheck && \
+    chmod a+rx /openstack/healthcheck
+{% endblock %}
+
 {% block base_footer %}
 # workaround LP1696283
 RUN mkdir -p /etc/ssh && touch /etc/ssh/ssh_known_hosts

healthcheck/ovn-metadata

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
+
+process='ovn-metadata-agent'
+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

tripleo_common/tests/image/test_kolla_builder.py

@@ -281,6 +281,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                           'nb-db-server:latest'},
             {'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-'
                           'sb-db-server:latest'},
+            {'imagename': 'docker.io/tripleoupstream/centos-binary'
+                          '-neutron-metadata-agent-ovn:latest'},
             {'imagename': 'docker.io/tripleoupstream/centos-binary'
                           '-rsyslog-base:latest'}]
         self._test_container_images_yaml_in_sync_helper(
@@ -303,6 +305,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                           'nb-db-server:latest'},
             {'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-'
                           'sb-db-server:latest'},
+            {'imagename': 'docker.io/tripleoupstream/centos-binary'
+                          '-neutron-metadata-agent-ovn:latest'},
             {'imagename': 'docker.io/tripleoupstream/centos-binary'
                           '-rsyslog-base:latest'}]
         self._test_container_images_yaml_in_sync_helper(
@@ -339,6 +343,8 @@ class TestKollaImageBuilderTemplate(base.TestCase):
             {'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-'
                           'nb-db-server:latest'},
             {'imagename': 'docker.io/tripleoupstream/centos-binary-ovn-'
-                          'sb-db-server:latest'}]
+                          'sb-db-server:latest'},
+            {'imagename': 'docker.io/tripleoupstream/centos-binary'
+                          '-neutron-metadata-agent-ovn:latest'}]
         self._test_container_images_yaml_in_sync_helper(
             remove_images=remove_images, logging='stdout')