openstack/kayobe
Code Issues Proposed changes

Make more container image builds conditional

Browse Source 
Also adds support for building the etcd image.
This commit is contained in:
Mark Goddard
2017-11-17 17:31:12 +00:00
parent 713da0730f
commit d130b8a62c
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ansible/group_vars/all/kolla
View File

@@ -113,33 +113,35 @@ overcloud_container_image_regex_map:
- regex: ceilometer - regex: ceilometer
enabled: "{{ kolla_enable_ceilometer | bool }}" enabled: "{{ kolla_enable_ceilometer | bool }}"
- regex: cinder - regex: cinder
enabled: True enabled: "{{ kolla_enable_cinder | bool }}"
- regex: cron - regex: cron
enabled: True enabled: True
- regex: designate - regex: designate
enabled: "{{ kolla_enable_designate | bool }}" enabled: "{{ kolla_enable_designate | bool }}"
- regex: dnsmasq - regex: dnsmasq
enabled: True enabled: "{{ kolla_enable_ironic | bool }}"
- regex: elasticsearch - regex: elasticsearch
enabled: "{{ kolla_enable_elasticsearch | bool }}" enabled: "{{ kolla_enable_elasticsearch | bool }}"
- regex: etcd
enabled: "{{ kolla_enable_etcd | bool }}"
- regex: fluentd - regex: fluentd
enabled: True enabled: True
- regex: glance - regex: glance
enabled: "{{ kolla_enable_glance | bool }}" enabled: "{{ kolla_enable_glance | bool }}"
- regex: gnocchi - regex: gnocchi
enabled: "{{ kolla_enable_gnocchi | bool }}" enabled: "{{ kolla_enable_gnocchi | bool }}"
- regex: haproxy - regex: ^haproxy$
enabled: True enabled: "{{ kolla_enable_haproxy | bool }}"
- regex: heat - regex: heat
enabled: True enabled: "{{ kolla_enable_heat | bool }}"
- regex: horizon - regex: horizon
enabled: True enabled: "{{ kolla_enable_horizon | bool }}"
- regex: ironic - regex: ironic
enabled: "{{ kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_ironic | bool }}"
- regex: iscsid - regex: iscsid
enabled: True enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}"
- regex: keepalived - regex: keepalived
enabled: True enabled: "{{ kolla_enable_haproxy | bool }}"
- regex: keystone - regex: keystone
enabled: True enabled: True
- regex: kibana - regex: kibana
@@ -155,14 +157,14 @@ overcloud_container_image_regex_map:
- regex: memcached - regex: memcached
enabled: True enabled: True
- regex: neutron-server - regex: neutron-server
enabled: True enabled: "{{ kolla_enable_neutron | bool }}"
# 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: True enabled: "{{ kolla_enable_neutron | bool }}"
- regex: nova - regex: nova
enabled: True enabled: "{{ kolla_enable_nova | bool }}"
- regex: openvswitch - regex: openvswitch
enabled: True enabled: "{{ kolla_enable_neutron | bool }}"
- regex: rabbitmq - regex: rabbitmq
enabled: True enabled: True
- regex: sahara - regex: sahara
@@ -172,7 +174,7 @@ overcloud_container_image_regex_map:
- regex: swift - regex: swift
enabled: "{{ kolla_enable_swift | bool }}" enabled: "{{ kolla_enable_swift | bool }}"
- regex: tgtd - regex: tgtd
enabled: True enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | 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.
@@ -264,8 +266,10 @@ kolla_enable_barbican: "no"
kolla_enable_central_logging: "no" kolla_enable_central_logging: "no"
kolla_enable_ceph: "no" kolla_enable_ceph: "no"
kolla_enable_ceilometer: "no" kolla_enable_ceilometer: "no"
kolla_enable_cinder: "no"
kolla_enable_designate: "no" kolla_enable_designate: "no"
kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_freezer | bool or kolla_enable_osprofiler | bool or kolla_enable_skydive | bool else 'no' }}" kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_freezer | bool or kolla_enable_osprofiler | bool or kolla_enable_skydive | bool else 'no' }}"
kolla_enable_etcd: "no"
kolla_enable_freezer: "no" kolla_enable_freezer: "no"
kolla_enable_glance: "yes" kolla_enable_glance: "yes"
kolla_enable_gnocchi: "no" kolla_enable_gnocchi: "no"