From 33d39f29421bec986b96b112d11cc8caa36a896d Mon Sep 17 00:00:00 2001
From: Angus Salkeld <asalkeld@mirantis.com>
Date: Mon, 9 Nov 2015 15:20:13 +1000
Subject: [PATCH] Fix validate-all-maintainer.sh to look for Dockerfile.j2

And fix the fallout.

Change-Id: Iccad3f4fdb0a6a7c14246df3408cae0425b833a5
---
 docker/designate/designate-api/Dockerfile.j2           | 2 +-
 docker/designate/designate-backend-bind9/Dockerfile.j2 | 2 +-
 docker/designate/designate-base/Dockerfile.j2          | 2 +-
 docker/designate/designate-central/Dockerfile.j2       | 2 +-
 docker/designate/designate-mdns/Dockerfile.j2          | 2 +-
 docker/designate/designate-poolmanager/Dockerfile.j2   | 2 +-
 docker/designate/designate-sink/Dockerfile.j2          | 2 +-
 docker/horizon/Dockerfile.j2                           | 2 +-
 docker/neutron/neutron-agents/Dockerfile.j2            | 2 +-
 docker/neutron/neutron-base/Dockerfile.j2              | 2 +-
 docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 2 +-
 docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 +-
 docker/neutron/neutron-server/Dockerfile.j2            | 2 +-
 docker/swift/swift-account-auditor/Dockerfile.j2       | 2 +-
 docker/swift/swift-account-reaper/Dockerfile.j2        | 2 +-
 docker/swift/swift-account-replicator/Dockerfile.j2    | 2 +-
 docker/swift/swift-account-server/Dockerfile.j2        | 2 +-
 docker/swift/swift-base/Dockerfile.j2                  | 2 +-
 docker/swift/swift-container-auditor/Dockerfile.j2     | 2 +-
 docker/swift/swift-container-replicator/Dockerfile.j2  | 2 +-
 docker/swift/swift-container-server/Dockerfile.j2      | 2 +-
 docker/swift/swift-container-updater/Dockerfile.j2     | 2 +-
 docker/swift/swift-object-auditor/Dockerfile.j2        | 2 +-
 docker/swift/swift-object-base/Dockerfile.j2           | 2 +-
 docker/swift/swift-object-expirer/Dockerfile.j2        | 2 +-
 docker/swift/swift-object-replicator/Dockerfile.j2     | 2 +-
 docker/swift/swift-object-server/Dockerfile.j2         | 2 +-
 docker/swift/swift-object-updater/Dockerfile.j2        | 2 +-
 docker/swift/swift-proxy-server/Dockerfile.j2          | 2 +-
 tools/validate-all-maintainer.sh                       | 3 +--
 30 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/docker/designate/designate-api/Dockerfile.j2 b/docker/designate/designate-api/Dockerfile.j2
index 4f7e256340..268a93fedc 100644
--- a/docker/designate/designate-api/Dockerfile.j2
+++ b/docker/designate/designate-api/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2
index 47eff21222..8f9a9aec39 100644
--- a/docker/designate/designate-backend-bind9/Dockerfile.j2
+++ b/docker/designate/designate-backend-bind9/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index b29bb7723e..fe9657d6f9 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/docker/designate/designate-base/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/designate/designate-central/Dockerfile.j2 b/docker/designate/designate-central/Dockerfile.j2
index 7ff0399750..2195441ba9 100644
--- a/docker/designate/designate-central/Dockerfile.j2
+++ b/docker/designate/designate-central/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/designate/designate-mdns/Dockerfile.j2 b/docker/designate/designate-mdns/Dockerfile.j2
index 6c2125f30d..97f9a2ffc9 100644
--- a/docker/designate/designate-mdns/Dockerfile.j2
+++ b/docker/designate/designate-mdns/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/designate/designate-poolmanager/Dockerfile.j2 b/docker/designate/designate-poolmanager/Dockerfile.j2
index ad4b428d5c..35d847211d 100644
--- a/docker/designate/designate-poolmanager/Dockerfile.j2
+++ b/docker/designate/designate-poolmanager/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index 6c4a3ea407..8b863bfbfa 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/docker/designate/designate-sink/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}designate-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index a777297c34..30b2277814 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2
index 024a6d2f8b..28b73f1b2f 100644
--- a/docker/neutron/neutron-agents/Dockerfile.j2
+++ b/docker/neutron/neutron-agents/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
 
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 8a48517d1f..88d065b330 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/docker/neutron/neutron-base/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
index 179890b46c..8939d72fe3 100644
--- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
index 5e659f5a0d..39eaa889d2 100644
--- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
+++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2
index 738cf252a7..1cb386d2f0 100644
--- a/docker/neutron/neutron-server/Dockerfile.j2
+++ b/docker/neutron/neutron-server/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 RUN chmod 755 /usr/local/bin/kolla_extend_start
diff --git a/docker/swift/swift-account-auditor/Dockerfile.j2 b/docker/swift/swift-account-auditor/Dockerfile.j2
index baa52aaa30..2548d9e4d5 100644
--- a/docker/swift/swift-account-auditor/Dockerfile.j2
+++ b/docker/swift/swift-account-auditor/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
diff --git a/docker/swift/swift-account-reaper/Dockerfile.j2 b/docker/swift/swift-account-reaper/Dockerfile.j2
index baa52aaa30..2548d9e4d5 100644
--- a/docker/swift/swift-account-reaper/Dockerfile.j2
+++ b/docker/swift/swift-account-reaper/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
diff --git a/docker/swift/swift-account-replicator/Dockerfile.j2 b/docker/swift/swift-account-replicator/Dockerfile.j2
index baa52aaa30..2548d9e4d5 100644
--- a/docker/swift/swift-account-replicator/Dockerfile.j2
+++ b/docker/swift/swift-account-replicator/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
diff --git a/docker/swift/swift-account-server/Dockerfile.j2 b/docker/swift/swift-account-server/Dockerfile.j2
index 22bb86298c..cf254cec59 100644
--- a/docker/swift/swift-account-server/Dockerfile.j2
+++ b/docker/swift/swift-account-server/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 192e9821c8..f6326ca679 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/swift/swift-container-auditor/Dockerfile.j2 b/docker/swift/swift-container-auditor/Dockerfile.j2
index 2a784a23e5..54f2b3296e 100644
--- a/docker/swift/swift-container-auditor/Dockerfile.j2
+++ b/docker/swift/swift-container-auditor/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
diff --git a/docker/swift/swift-container-replicator/Dockerfile.j2 b/docker/swift/swift-container-replicator/Dockerfile.j2
index 2a784a23e5..54f2b3296e 100644
--- a/docker/swift/swift-container-replicator/Dockerfile.j2
+++ b/docker/swift/swift-container-replicator/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
diff --git a/docker/swift/swift-container-server/Dockerfile.j2 b/docker/swift/swift-container-server/Dockerfile.j2
index cc456fd25a..c09d3489d2 100644
--- a/docker/swift/swift-container-server/Dockerfile.j2
+++ b/docker/swift/swift-container-server/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/swift/swift-container-updater/Dockerfile.j2 b/docker/swift/swift-container-updater/Dockerfile.j2
index 2a784a23e5..54f2b3296e 100644
--- a/docker/swift/swift-container-updater/Dockerfile.j2
+++ b/docker/swift/swift-container-updater/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
diff --git a/docker/swift/swift-object-auditor/Dockerfile.j2 b/docker/swift/swift-object-auditor/Dockerfile.j2
index 211b3e5305..449743b921 100644
--- a/docker/swift/swift-object-auditor/Dockerfile.j2
+++ b/docker/swift/swift-object-auditor/Dockerfile.j2
@@ -1,4 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {{ include_footer }}
diff --git a/docker/swift/swift-object-base/Dockerfile.j2 b/docker/swift/swift-object-base/Dockerfile.j2
index f89d8da88a..aa299fc7fe 100644
--- a/docker/swift/swift-object-base/Dockerfile.j2
+++ b/docker/swift/swift-object-base/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/swift/swift-object-expirer/Dockerfile.j2 b/docker/swift/swift-object-expirer/Dockerfile.j2
index 31078bda1a..5e3e993ca3 100644
--- a/docker/swift/swift-object-expirer/Dockerfile.j2
+++ b/docker/swift/swift-object-expirer/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/docker/swift/swift-object-replicator/Dockerfile.j2 b/docker/swift/swift-object-replicator/Dockerfile.j2
index 211b3e5305..449743b921 100644
--- a/docker/swift/swift-object-replicator/Dockerfile.j2
+++ b/docker/swift/swift-object-replicator/Dockerfile.j2
@@ -1,4 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {{ include_footer }}
diff --git a/docker/swift/swift-object-server/Dockerfile.j2 b/docker/swift/swift-object-server/Dockerfile.j2
index 211b3e5305..449743b921 100644
--- a/docker/swift/swift-object-server/Dockerfile.j2
+++ b/docker/swift/swift-object-server/Dockerfile.j2
@@ -1,4 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {{ include_footer }}
diff --git a/docker/swift/swift-object-updater/Dockerfile.j2 b/docker/swift/swift-object-updater/Dockerfile.j2
index 211b3e5305..449743b921 100644
--- a/docker/swift/swift-object-updater/Dockerfile.j2
+++ b/docker/swift/swift-object-updater/Dockerfile.j2
@@ -1,4 +1,4 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-object-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {{ include_footer }}
diff --git a/docker/swift/swift-proxy-server/Dockerfile.j2 b/docker/swift/swift-proxy-server/Dockerfile.j2
index f997214e2b..37cde17e83 100644
--- a/docker/swift/swift-proxy-server/Dockerfile.j2
+++ b/docker/swift/swift-proxy-server/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 {% if install_type == 'binary' %}
     {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
diff --git a/tools/validate-all-maintainer.sh b/tools/validate-all-maintainer.sh
index e2fe26a605..32ac477eea 100755
--- a/tools/validate-all-maintainer.sh
+++ b/tools/validate-all-maintainer.sh
@@ -3,6 +3,5 @@
 REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
 cd "$(dirname "$REAL_PATH")/.."
 
-find docker -name Dockerfile -print0 |
+find docker -name Dockerfile.j2 -print0 |
     xargs -0 tools/validate-maintainer.sh || exit 1
-