Merge "Add <project>_install_type for all projects"

ansible/roles/chrony/defaults/main.yml

@@ -16,7 +16,8 @@ chrony_bindaddress: "{{ kolla_internal_vip_address }}"
 ####################
 # Docker
 ####################
-chrony_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-chrony"
+chrony_install_type: "{{ kolla_install_type }}"
+chrony_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ chrony_install_type }}-chrony"
 chrony_tag: "{{ openstack_release }}"
 chrony_image_full: "{{ chrony_image }}:{{ chrony_tag }}"
 

ansible/roles/collectd/defaults/main.yml

@@ -14,7 +14,8 @@ collectd_services:
 ####################
 # Docker
 ####################
-collectd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-collectd"
+collectd_install_type: "{{ kolla_install_type }}"
+collectd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ collectd_install_type }}-collectd"
 collectd_tag: "{{ openstack_release }}"
 collectd_image_full: "{{ collectd_image }}:{{ collectd_tag }}"
 

ansible/roles/elasticsearch/defaults/main.yml

@@ -31,7 +31,8 @@ es_java_opts: "{% if es_heap_size %}-Xms{{ es_heap_size }} -Xmx{{ es_heap_size }
 ####################
 # Docker
 ####################
-elasticsearch_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-elasticsearch"
+elasticsearch_install_type: "{{ kolla_install_type }}"
+elasticsearch_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ elasticsearch_install_type }}-elasticsearch"
 elasticsearch_tag: "{{ openstack_release }}"
 elasticsearch_image_full: "{{ elasticsearch_image }}:{{ elasticsearch_tag }}"
 

ansible/roles/etcd/defaults/main.yml

@@ -26,7 +26,8 @@ etcd_services:
 ####################
 # Docker
 ####################
-etcd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-etcd"
+etcd_install_type: "{{ kolla_install_type }}"
+etcd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ etcd_install_type }}-etcd"
 etcd_tag: "{{ openstack_release }}"
 etcd_image_full: "{{ etcd_image }}:{{ etcd_tag }}"
 etcd_dimensions: "{{ default_container_dimensions }}"

ansible/roles/grafana/defaults/main.yml

@@ -57,7 +57,8 @@ grafana_data_sources:
 ##########
 # Grafana
 ##########
-grafana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-grafana"
+grafana_install_type: "{{ kolla_install_type }}"
+grafana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ grafana_install_type }}-grafana"
 grafana_tag: "{{ openstack_release }}"
 grafana_image_full: "{{ grafana_image }}:{{ grafana_tag }}"
 grafana_admin_username: "admin"

ansible/roles/haproxy/defaults/main.yml

@@ -23,11 +23,13 @@ haproxy_services:
 ####################
 # Docker
 ####################
-keepalived_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-keepalived"
+keepalived_install_type: "{{ kolla_install_type }}"
+keepalived_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ keepalived_install_type }}-keepalived"
 keepalived_tag: "{{ openstack_release }}"
 keepalived_image_full: "{{ keepalived_image }}:{{ keepalived_tag }}"
 
-haproxy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-haproxy"
+haproxy_install_type: "{{ kolla_install_type }}"
+haproxy_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ haproxy_install_type }}-haproxy"
 haproxy_tag: "{{ openstack_release }}"
 haproxy_image_full: "{{ haproxy_image }}:{{ haproxy_tag }}"
 

ansible/roles/influxdb/defaults/main.yml

@@ -28,7 +28,8 @@ influxdb_enable_tsi: True
 ####################
 # Docker
 ####################
-influxdb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-influxdb"
+influxdb_install_type: "{{ kolla_install_type }}"
+influxdb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ influxdb_install_type }}-influxdb"
 influxdb_tag: "{{ openstack_release }}"
 influxdb_image_full: "{{ influxdb_image }}:{{ influxdb_tag }}"
 influxdb_dimensions: "{{ default_container_dimensions }}"

ansible/roles/kibana/defaults/main.yml

@@ -48,7 +48,8 @@ kibana_default_index_options:
 ####################
 # Docker
 ####################
-kibana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kibana"
+kibana_install_type: "{{ kolla_install_type }}"
+kibana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kibana_install_type }}-kibana"
 kibana_tag: "{{ openstack_release }}"
 kibana_image_full: "{{ kibana_image }}:{{ kibana_tag }}"
 kibana_dimensions: "{{ default_container_dimensions }}"

ansible/roles/kuryr/defaults/main.yml

@@ -24,7 +24,8 @@ kuryr_services:
 ####################
 # Docker
 ####################
-kuryr_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-kuryr-libnetwork"
+kuryr_install_type: "{{ kolla_install_type }}"
+kuryr_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kuryr_install_type }}-kuryr-libnetwork"
 kuryr_tag: "{{ openstack_release }}"
 kuryr_image_full: "{{ kuryr_image }}:{{ kuryr_tag }}"
 

ansible/roles/mariadb/defaults/main.yml

@@ -51,7 +51,8 @@ external_haproxy_members: "{% for host in groups['mariadb'] %}server {{ host }}
 ####################
 # Docker
 ####################
-mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-mariadb"
+mariadb_install_type: "{{ kolla_install_type }}"
+mariadb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ mariadb_install_type }}-mariadb"
 mariadb_tag: "{{ openstack_release }}"
 mariadb_image_full: "{{ mariadb_image }}:{{ mariadb_tag }}"
 mariadb_dimensions: "{{ default_container_dimensions }}"
@@ -71,7 +72,7 @@ mariadb_service: "{{ mariadb_services['mariadb'] }}"
 ####################
 # Backups
 ####################
-xtrabackup_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-xtrabackup"
+xtrabackup_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ mariadb_install_type }}-xtrabackup"
 xtrabackup_tag: "{{ openstack_release }}"
 xtrabackup_image_full: "{{ xtrabackup_image }}:{{ xtrabackup_tag }}"
 

ansible/roles/memcached/defaults/main.yml

@@ -30,7 +30,8 @@ haproxy_members: "{% for host in groups['memcached'] %}server {{ hostvars[host][
 ####################
 # Docker
 ####################
-memcached_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-memcached"
+memcached_install_type: "{{ kolla_install_type }}"
+memcached_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ memcached_install_type }}-memcached"
 memcached_tag: "{{ openstack_release }}"
 memcached_image_full: "{{ memcached_image }}:{{ memcached_tag }}"
 memcached_dimensions: "{{ default_container_dimensions }}"

ansible/roles/mongodb/defaults/main.yml

@@ -21,7 +21,8 @@ mongodb_services:
 ####################
 # Docker
 ####################
-mongodb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-mongodb"
+mongodb_install_type: "{{ kolla_install_type }}"
+mongodb_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ mongodb_install_type }}-mongodb"
 mongodb_tag: "{{ openstack_release }}"
 mongodb_image_full: "{{ mongodb_image }}:{{ mongodb_tag }}"
 mongodb_dimensions: "{{ default_container_dimensions }}"

ansible/roles/multipathd/defaults/main.yml

@@ -15,7 +15,8 @@ multipathd_services:
 ####################
 # Docker
 ####################
-multipathd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-multipathd"
+multipathd_install_type: "{{ kolla_install_type }}"
+multipathd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ multipathd_install_type }}-multipathd"
 multipathd_tag: "{{ openstack_release }}"
 multipathd_image_full: "{{ multipathd_image }}:{{ multipathd_tag }}"
 

ansible/roles/qdrouterd/defaults/main.yml

@@ -13,7 +13,8 @@ qdrouterd_services:
 ####################
 # Docker
 ####################
-qdrouterd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-qdrouterd"
+qdrouterd_install_type: "{{ kolla_install_type }}"
+qdrouterd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ qdrouterd_install_type }}-qdrouterd"
 qdrouterd_tag: "{{ openstack_release }}"
 qdrouterd_image_full: "{{ qdrouterd_image }}:{{ qdrouterd_tag }}"
 qdrouterd_dimensions: "{{ default_container_dimensions }}"

ansible/roles/rabbitmq/defaults/main.yml

@@ -50,7 +50,8 @@ haproxy_outward_rabbitmq_server_timeout: "1h"
 ####################
 # Docker
 ####################
-rabbitmq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-rabbitmq"
+rabbitmq_install_type: "{{ kolla_install_type }}"
+rabbitmq_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ rabbitmq_install_type }}-rabbitmq"
 rabbitmq_tag: "{{ openstack_release }}"
 rabbitmq_image_full: "{{ rabbitmq_image }}:{{ rabbitmq_tag }}"
 rabbitmq_dimensions: "{{ default_container_dimensions }}"

ansible/roles/rally/defaults/main.yml

@@ -14,7 +14,8 @@ rally_services:
 ########
 # Docker
 ########
-rally_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-rally"
+rally_install_type: "{{ kolla_install_type }}"
+rally_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ rally_install_type }}-rally"
 rally_tag: "{{ openstack_release }}"
 rally_image_full: "{{ rally_image }}:{{ rally_tag }}"
 rally_dimensions: "{{ default_container_dimensions }}"

ansible/roles/redis/defaults/main.yml

@@ -20,11 +20,12 @@ redis_services:
 ####################
 # Docker
 ####################
-redis_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-redis"
+redis_install_type: "{{ kolla_install_type }}"
+redis_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ redis_install_type }}-redis"
 redis_tag: "{{ openstack_release }}"
 redis_image_full: "{{ redis_image }}:{{ redis_tag }}"
 
-redis_sentinel_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-redis-sentinel"
+redis_sentinel_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ redis_install_type }}-redis-sentinel"
 redis_sentinel_tag: "{{ openstack_release }}"
 redis_sentinel_image_full: "{{ redis_sentinel_image }}:{{ redis_tag }}"
 redis_dimensions: "{{ default_container_dimensions }}"

ansible/roles/skydive/defaults/main.yml

@@ -32,11 +32,12 @@ skydive_services:
 ####################
 # Docker
 ####################
-skydive_analyzer_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-skydive-analyzer"
+skydive_install_type: "{{ kolla_install_type }}"
+skydive_analyzer_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ skydive_install_type }}-skydive-analyzer"
 skydive_analyzer_tag: "{{ openstack_release }}"
 skydive_analyzer_image_full: "{{ skydive_analyzer_image }}:{{ skydive_analyzer_tag }}"
 
-skydive_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-skydive-agent"
+skydive_agent_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ skydive_install_type }}-skydive-agent"
 skydive_agent_tag: "{{ openstack_release }}"
 skydive_agent_image_full: "{{ skydive_agent_image }}:{{ skydive_agent_tag }}"
 skydive_analyzer_dimensions: "{{ default_container_dimensions }}"

ansible/roles/telegraf/defaults/main.yml

@@ -14,7 +14,8 @@ telegraf_services:
 ####################
 # Docker
 ####################
-telegraf_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-telegraf"
+telegraf_install_type: "{{ kolla_install_type }}"
+telegraf_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ telegraf_install_type }}-telegraf"
 telegraf_tag: "{{ openstack_release }}"
 telegraf_image_full: "{{ telegraf_image }}:{{ telegraf_tag }}"
 telegraf_dimensions: "{{ default_container_dimensions }}"

ansible/roles/tempest/defaults/main.yml

@@ -14,7 +14,8 @@ tempest_services:
 ########
 # Docker
 ########
-tempest_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-tempest"
+tempest_install_type: "{{ kolla_install_type }}"
+tempest_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ tempest_install_type }}-tempest"
 tempest_tag: "{{ openstack_release }}"
 tempest_image_full: "{{ tempest_image }}:{{ tempest_tag }}"
 tempest_dimensions: "{{ default_container_dimensions }}"