Skip to content
Snippets Groups Projects
Commit 50317285 authored by Will Szumski's avatar Will Szumski Committed by Mark Goddard
Browse files

Update image regexes

Some images were not being built automatically due to a missing regex.
The most notable being chrony.

Change-Id: Ia0aa15300f58fc4e912dea7ed304a1cdaf51382a
Story: 2007796
Task: 40050
parent bde426c9
No related branches found
No related tags found
No related merge requests found
...@@ -122,6 +122,8 @@ overcloud_container_image_regex_map: ...@@ -122,6 +122,8 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_blazar | bool }}" enabled: "{{ kolla_enable_blazar | bool }}"
- regex: ceilometer - regex: ceilometer
enabled: "{{ kolla_enable_ceilometer | bool }}" enabled: "{{ kolla_enable_ceilometer | bool }}"
- regex: chrony
enabled: "{{ kolla_enable_chrony | bool }}"
- regex: cinder - regex: cinder
enabled: "{{ kolla_enable_cinder | bool }}" enabled: "{{ kolla_enable_cinder | bool }}"
- regex: cloudkitty - regex: cloudkitty
...@@ -130,6 +132,8 @@ overcloud_container_image_regex_map: ...@@ -130,6 +132,8 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_collectd | bool }}" enabled: "{{ kolla_enable_collectd | bool }}"
- regex: cron - regex: cron
enabled: True enabled: True
- regex: cyborg
enabled: "{{ kolla_enable_cyborg | bool }}"
- regex: designate - regex: designate
enabled: "{{ kolla_enable_designate | bool }}" enabled: "{{ kolla_enable_designate | bool }}"
- regex: dnsmasq - regex: dnsmasq
...@@ -139,13 +143,13 @@ overcloud_container_image_regex_map: ...@@ -139,13 +143,13 @@ overcloud_container_image_regex_map:
- regex: etcd - regex: etcd
enabled: "{{ kolla_enable_etcd | bool }}" enabled: "{{ kolla_enable_etcd | bool }}"
- regex: fluentd - regex: fluentd
enabled: True enabled: "{{ kolla_enable_fluentd | bool }}"
- regex: glance - regex: glance
enabled: "{{ kolla_enable_glance | bool }}" enabled: "{{ kolla_enable_glance | bool }}"
- regex: grafana
enabled: "{{ kolla_enable_grafana | bool }}"
- regex: gnocchi - regex: gnocchi
enabled: "{{ kolla_enable_gnocchi | bool }}" enabled: "{{ kolla_enable_gnocchi | bool }}"
- regex: grafana
enabled: "{{ kolla_enable_grafana | bool }}"
- regex: ^haproxy$ - regex: ^haproxy$
enabled: "{{ kolla_enable_haproxy | bool }}" enabled: "{{ kolla_enable_haproxy | bool }}"
- regex: heat - regex: heat
...@@ -159,11 +163,13 @@ overcloud_container_image_regex_map: ...@@ -159,11 +163,13 @@ overcloud_container_image_regex_map:
- regex: ironic-neutron-agent - regex: ironic-neutron-agent
enabled: "{{ kolla_enable_ironic_neutron_agent | bool }}" enabled: "{{ kolla_enable_ironic_neutron_agent | bool }}"
- regex: iscsid - regex: iscsid
enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_iscsid | bool }}"
- regex: kafka - regex: kafka
enabled: "{{ kolla_enable_kafka | bool }}" enabled: "{{ kolla_enable_kafka | bool }}"
- regex: karbor
enabled: "{{ kolla_enable_karbor | bool }}"
- regex: keepalived - regex: keepalived
enabled: "{{ kolla_enable_haproxy | bool }}" enabled: "{{ kolla_enable_keepalived | bool }}"
- regex: keystone - regex: keystone
enabled: "{{ kolla_enable_keystone | bool }}" enabled: "{{ kolla_enable_keystone | bool }}"
- regex: kibana - regex: kibana
...@@ -172,14 +178,24 @@ overcloud_container_image_regex_map: ...@@ -172,14 +178,24 @@ overcloud_container_image_regex_map:
enabled: True enabled: True
- regex: logstash - regex: logstash
enabled: "{{ kolla_enable_monasca | bool }}" enabled: "{{ kolla_enable_monasca | bool }}"
- regex: kuryr
enabled: "{{ kolla_enable_kuryr | bool }}"
- regex: magnum - regex: magnum
enabled: "{{ kolla_enable_magnum | bool }}" enabled: "{{ kolla_enable_magnum | bool }}"
- regex: manila - regex: manila
enabled: "{{ kolla_enable_manila | bool }}" enabled: "{{ kolla_enable_manila | bool }}"
- regex: mariadb - regex: mariadb
enabled: "{{ kolla_enable_mariadb | bool }}" enabled: "{{ kolla_enable_mariadb | bool }}"
- regex: masakari
enabled: "{{ kolla_enable_masakari | bool }}"
- regex: memcached - regex: memcached
enabled: True enabled: "{{ kolla_enable_memcached | bool }}"
- regex: mistral
enabled: "{{ kolla_enable_mistral | bool }}"
- regex: mongodb
enabled: "{{ kolla_enable_mongodb | bool }}"
- regex: multipathd
enabled: "{{ kolla_enable_multipathd | bool }}"
- regex: murano - regex: murano
enabled: "{{ kolla_enable_murano | bool }}" enabled: "{{ kolla_enable_murano | bool }}"
- regex: neutron-server - regex: neutron-server
...@@ -187,34 +203,66 @@ overcloud_container_image_regex_map: ...@@ -187,34 +203,66 @@ overcloud_container_image_regex_map:
# Neutron SFC agent not currently supported on CentOS binary builds. # Neutron SFC agent not currently supported on CentOS binary builds.
- regex: "neutron-\\(dhcp\\|l3\\|metadata\\|openvswitch\\)-agent" - regex: "neutron-\\(dhcp\\|l3\\|metadata\\|openvswitch\\)-agent"
enabled: "{{ kolla_enable_neutron | bool }}" enabled: "{{ kolla_enable_neutron | bool }}"
- regex: neutron-lbaas-agent
enabled: "{{ kolla_enable_neutron_lbaas | bool }}"
- regex: nova - regex: nova
enabled: "{{ kolla_enable_nova | bool }}" enabled: "{{ kolla_enable_nova | bool }}"
- regex: octavia - regex: octavia
enabled: "{{ kolla_enable_octavia | bool }}" enabled: "{{ kolla_enable_octavia | bool }}"
- regex: openvswitch - regex: openvswitch
enabled: "{{ kolla_enable_neutron | bool }}" enabled: "{{ kolla_enable_openvswitch | bool }}"
- regex: rabbitmq - regex: ovn
enabled: True enabled: "{{ kolla_enable_ovn | bool }}"
- regex: ovsdpdk
enabled: "{{ kolla_enable_ovs_dpdk | bool }}"
- regex: panko
enabled: "{{ kolla_enable_panko | bool }}"
- regex: placement - regex: placement
enabled: "{{ kolla_enable_nova | bool }}" enabled: "{{ kolla_enable_nova | bool }}"
- regex: prometheus - regex: prometheus
enabled: "{{ kolla_enable_prometheus | bool }}" enabled: "{{ kolla_enable_prometheus | bool }}"
- regex: qdrouterd
enabled: "{{ kolla_enable_qdrouterd | bool }}"
- regex: qinling
enabled: "{{ kolla_enable_qinling | bool }}"
- regex: rabbitmq
enabled: "{{ kolla_enable_rabbitmq | bool }}"
- regex: rally
enabled: "{{ kolla_enable_rally | bool }}"
- regex: redis
enabled: "{{ kolla_enable_redis | bool }}"
- regex: sahara - regex: sahara
enabled: "{{ kolla_enable_sahara | bool }}" enabled: "{{ kolla_enable_sahara | bool }}"
- regex: searchlight
enabled: "{{ kolla_enable_searchlight | bool }}"
- regex: senlin
enabled: "{{ kolla_enable_senlin | bool }}"
- regex: skydive - regex: skydive
enabled: "{{ kolla_enable_skydive | bool }}" enabled: "{{ kolla_enable_skydive | bool }}"
- regex: solum
enabled: "{{ kolla_enable_solum | bool }}"
- regex: storm - regex: storm
enabled: "{{ kolla_enable_storm | bool }}" enabled: "{{ kolla_enable_storm | bool }}"
- regex: swift - regex: swift
enabled: "{{ kolla_enable_swift | bool }}" enabled: "{{ kolla_enable_swift | bool }}"
- regex: tacker
enabled: "{{ kolla_enable_tacker | bool }}"
- regex: telegraf - regex: telegraf
enabled: "{{ kolla_enable_telegraf | bool }}" enabled: "{{ kolla_enable_telegraf | bool }}"
- regex: tempest
enabled: "{{ kolla_enable_tempest | bool }}"
- regex: tgtd - regex: tgtd
enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}"
- regex: trove
enabled: "{{ kolla_enable_trove | bool }}"
- regex: vitrage
enabled: "{{ kolla_enable_vitrage | bool }}"
- regex: vmtp
enabled: "{{ kolla_enable_vmtp | bool }}"
- regex: watcher
enabled: "{{ kolla_enable_watcher | bool }}"
- regex: zookeeper - regex: zookeeper
enabled: "{{ kolla_enable_zookeeper | bool }}" enabled: "{{ kolla_enable_zookeeper | bool }}"
- regex: zun
enabled: "{{ kolla_enable_zun | bool }}"
# List of regular expressions matching names of container images to build for # List of regular expressions matching names of container images to build for
# overcloud hosts. # overcloud hosts.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment