Merge "Make OVS container build regex independent to OVN"
This commit is contained in:
commit
5244733d75
@ -206,7 +206,7 @@ overcloud_container_image_regex_map:
|
|||||||
- regex: "neutron-\\(server\\|metadata-agent\\)"
|
- regex: "neutron-\\(server\\|metadata-agent\\)"
|
||||||
enabled: "{{ kolla_enable_neutron | bool }}"
|
enabled: "{{ kolla_enable_neutron | bool }}"
|
||||||
- regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent"
|
- regex: "neutron-\\(dhcp\\|l3\\|linuxbridge\\|openvswitch\\)-agent"
|
||||||
enabled: "{{ kolla_enable_neutron | bool and not kolla_enable_ovn | bool}}"
|
enabled: "{{ kolla_build_neutron_ovs | default(kolla_enable_neutron | bool and not kolla_enable_ovn | bool) }}"
|
||||||
- regex: neutron-mlnx-agent
|
- regex: neutron-mlnx-agent
|
||||||
enabled: "{{ kolla_enable_neutron_mlnx | bool }}"
|
enabled: "{{ kolla_enable_neutron_mlnx | bool }}"
|
||||||
- regex: neutron-ovn-agent
|
- regex: neutron-ovn-agent
|
||||||
|
@ -533,6 +533,12 @@ image name regular expressions::
|
|||||||
|
|
||||||
(kayobe) $ kayobe overcloud container image build ironic- nova-api
|
(kayobe) $ kayobe overcloud container image build ironic- nova-api
|
||||||
|
|
||||||
|
When your environment uses OVN, OVS images will not be built. If you want to
|
||||||
|
build all Neutron images at the same time, extra variable ``kolla_build_neutron_ovs``
|
||||||
|
needs to be set to ``true``::
|
||||||
|
|
||||||
|
(kayobe) $ kayobe overcloud container image build -e kolla_build_neutron_ovs=true
|
||||||
|
|
||||||
In order to push images to a registry after they are built, add the ``--push``
|
In order to push images to a registry after they are built, add the ``--push``
|
||||||
argument.
|
argument.
|
||||||
|
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
Adds a new variable ``kolla_build_neutron_ovs`` which gives users to have
|
||||||
|
option to build OVS container images while the system is using OVN.
|
||||||
|
This is useful when an user wants to build all container images at the
|
||||||
|
same time.
|
Loading…
Reference in New Issue
Block a user