openstack
/
kayobe
Code Issues Proposed changes

Add support for the Ironic Neutron agent 

Change-Id: Ie697b59b48f2b543b3d3bb65566318f2d9a0f46c
This commit is contained in:
Will Miller 2018-07-18 16:21:19 +00:00
parent 8f76845f51
commit 9c1fa1dc7e
6 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all/kolla
View File

@ -146,6 +146,8 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_influxdb | bool }}" enabled: "{{ kolla_enable_influxdb | bool }}"
- regex: ironic - regex: ironic
enabled: "{{ kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_ironic | bool }}"
- regex: ironic-neutron-agent
enabled: "{{ kolla_enable_ironic_neutron_agent | bool }}"
- regex: iscsid - regex: iscsid
enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}" enabled: "{{ kolla_enable_cinder | bool or kolla_enable_ironic | bool }}"
- regex: kafka - regex: kafka
@ -317,6 +319,7 @@ kolla_enable_horizon: "yes"
kolla_enable_influxdb: "no" kolla_enable_influxdb: "no"
kolla_enable_ironic: "yes" kolla_enable_ironic: "yes"
kolla_enable_ironic_ipxe: "no" kolla_enable_ironic_ipxe: "no"
kolla_enable_ironic_neutron_agent: "{{ 'yes' if kolla_enable_neutron | bool and kolla_enable_ironic | bool else 'no' }}"
kolla_enable_kafka: "no" kolla_enable_kafka: "no"
kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool else 'no' }}" kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool else 'no' }}"
kolla_enable_magnum: "no" kolla_enable_magnum: "no"

3
ansible/roles/kolla-ansible/templates/overcloud-services.j2
View File

@ -73,6 +73,9 @@ neutron
[neutron-bgp-dragent:children] [neutron-bgp-dragent:children]
neutron neutron
[ironic-neutron-agent:children]
neutron
# Ceph # Ceph
[ceph-mds:children] [ceph-mds:children]
ceph ceph

1
ansible/roles/kolla-ansible/tests/test-defaults.yml
View File

@ -115,6 +115,7 @@
- neutron_tenant_network_types - neutron_tenant_network_types
- enable_glance - enable_glance
- enable_ironic - enable_ironic
- enable_ironic_neutron_agent
- enable_kafka - enable_kafka
- enable_influxdb - enable_influxdb
- enable_mariadb - enable_mariadb

2
ansible/roles/kolla-ansible/tests/test-extras.yml
View File

@ -85,6 +85,7 @@
kolla_enable_horizon: True kolla_enable_horizon: True
kolla_enable_influxdb: True kolla_enable_influxdb: True
kolla_enable_ironic: True kolla_enable_ironic: True
kolla_enable_ironic_neutron_agent: True
kolla_enable_kafka: True kolla_enable_kafka: True
kolla_enable_karbor: True kolla_enable_karbor: True
kolla_enable_kibana: True kolla_enable_kibana: True
@ -220,6 +221,7 @@
#enable_horizon: True #enable_horizon: True
#enable_influxdb: True #enable_influxdb: True
#enable_ironic: True #enable_ironic: True
#enable_ironic_neutron_agent: True
#enable_kafka: True #enable_kafka: True
#enable_karbor: True #enable_karbor: True
#enable_kibana: True #enable_kibana: True

1
ansible/roles/kolla-ansible/vars/main.yml
View File

@ -88,6 +88,7 @@ kolla_feature_flags:
- influxdb - influxdb
- ironic - ironic
- ironic_ipxe - ironic_ipxe
- ironic_neutron_agent
- ironic_pxe_uefi - ironic_pxe_uefi
- kafka - kafka
- karbor - karbor

4
releasenotes/notes/support_ironic_neutron_agent-a41e44ef41f5a96d.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Support configuration of the Ironic Neutron Agent and Neutron ML2 baremetal
plugin.