Merge "drop infra_image_prefix"

docker/cron/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/dnsmasq/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/elasticsearch/elasticsearch-curator/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/elasticsearch/elasticsearch/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/etcd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/fluentd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/grafana/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/hacluster/hacluster-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/hacluster/hacluster-corosync/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/hacluster/hacluster-pacemaker-remote/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/hacluster/hacluster-pacemaker/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/hacluster/hacluster-pcs/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}hacluster-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}hacluster-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/haproxy/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/influxdb/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/iscsid/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/kafka/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/keepalived/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/kibana/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/kolla-toolbox/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/logstash/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/mariadb/mariadb-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/mariadb/mariadb-clustercheck/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}mariadb-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 
 {% block mariadb_clustercheck_header %}{% endblock %}

docker/mariadb/mariadb-server/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}mariadb-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}mariadb-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/memcached/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/monasca/monasca-thresh/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}storm-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/multipathd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/nova/nova-libvirt/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/openstack-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/openvswitch/openvswitch-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/openvswitch/openvswitch-db-server/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovn/ovn-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}openvswitch-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovn/ovn-controller/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovn/ovn-nb-db-server/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovn/ovn-northd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovn/ovn-sb-db-server/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}ovn-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}ovn-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovsdpdk/ovsdpdk-db/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}ovsdpdk:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovsdpdk/ovsdpdk-vswitchd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}ovsdpdk:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}ovsdpdk:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/ovsdpdk/ovsdpdk/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-alertmanager/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-blackbox-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-cadvisor/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-elasticsearch-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-haproxy-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-libvirt-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-memcached-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-msteams/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-mtail/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-mysqld-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-node-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-openstack-exporter/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/prometheus/prometheus-v2-server/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/proxysql/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/qdrouterd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/rabbitmq/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/redis/redis-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/redis/redis-sentinel/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}redis-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/redis/redis/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}redis-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}redis-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/skydive/skydive-agent/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/skydive/skydive-analyzer/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}skydive-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/skydive/skydive-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/storm/storm-base/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/storm/storm/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}storm-base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}storm-base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/telegraf/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/tgtd/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

docker/zookeeper/Dockerfile.j2

@@ -1,4 +1,4 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
 {% block labels %}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}

kolla/image/build.py

@@ -646,7 +646,6 @@ class KollaWorker(object):
         self.clean_package_cache = self.conf.clean_package_cache
 
         self.image_prefix = self.base + '-' + self.install_type + '-'
-        self.infra_image_prefix = self.image_prefix
 
         self.regex = conf.regex
         self.image_statuses_bad = dict()
@@ -831,7 +830,6 @@ class KollaWorker(object):
                       'docker_healthchecks': self.docker_healthchecks,
                       'supported_distro_name': supported_distro_name,
                       'image_prefix': self.image_prefix,
-                      'infra_image_prefix': self.infra_image_prefix,
                       'install_type': self.install_type,
                       'namespace': self.namespace,
                       'openstack_release': self.openstack_release,
@@ -1255,8 +1253,7 @@ class KollaWorker(object):
 
         for parent_name, parent in sort_images.items():
             for image in sort_images.values():
-                if (image.parent_name == parent_name or image.parent_name ==
-                        parent_name.replace(self.install_type, 'infra')):
+                if (image.parent_name == parent_name):
                     parent.children.append(image)
                     image.parent = parent