Merge "Frr image support"

container-images/kolla/base/uid_gid_manage.sh

@@ -40,6 +40,8 @@ _SUPPORTED_USERS['cinder']='cinder 42407 42407 /var/lib/cinder kolla'
 _SUPPORTED_USERS['collectd']='collectd 42409 42409 /var/lib/collectd kolla'
 _SUPPORTED_USERS['designate']='designate 42411 42411 /var/lib/designate kolla'
 _SUPPORTED_USERS['etcd']='etcd 42413 42413 /var/lib/etcd kolla'
+_SUPPORTED_USERS['frrvty']='frrvty 42483 42483'
+_SUPPORTED_USERS['frr']='frr 42484 42484 /var/run/frr kolla,frrvty'
 _SUPPORTED_USERS['glance']='glance 42415 42415 /var/lib/glance kolla'
 _SUPPORTED_USERS['gnocchi']='gnocchi 42416 42416 /var/lib/gnocchi kolla'
 _SUPPORTED_USERS['haproxy']='haproxy 42454 42454 /var/lib/haproxy kolla'

container-images/tcib/base/frr/frr.yaml

@@ -0,0 +1,8 @@
+tcib_actions:
+- run: bash /usr/local/bin/uid_gid_manage frrvty frr
+- run: dnf install -y {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
+- run: mkdir -p /var/lock/subsys && chown "frr:" /var/lock/subsys
+tcib_packages:
+  common:
+  - frr
+tcib_user: frr

container-images/tripleo_containers.yaml

@@ -49,6 +49,8 @@ container_images:
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-etcd:current-tripleo
   image_source: tripleo
+- imagename: quay.io/tripleomaster/openstack-frr:current-tripleo
+  image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-glance-api:current-tripleo
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-gnocchi-api:current-tripleo

container-images/tripleo_containers.yaml.j2

@@ -220,6 +220,13 @@ container_images_template:
   services:
   - OS::TripleO::Services::Etcd
 
+- imagename: "{{namespace}}/{{name_prefix}}frr{{name_suffix}}:{{tag}}"
+  image_source: tripleo
+  params:
+  - ContainerFrrImage
+  services:
+  - OS::TripleO::Services::Frr
+
 - imagename: "{{namespace}}/{{name_prefix}}glance-api{{name_suffix}}:{{tag}}"
   image_source: tripleo
   params:

healthcheck/frr

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
+
+if ps -e | grep watchfrr; then
+    exit 0
+else
+    echo "No watch frr running"
+    exit 1
+fi