x/fuel-ccp-neutron
Code Issues Proposed changes

Create initial network depending on plugin agent type

Browse Source 
Create 'local' network if neutron.plugin_agent is 'calico'.

Change-Id: Idec8c794320aadcc295718bccd21608946b1a3db
Closes-Bug: #1645779
Co-Authored-By: Alexander Saprykin <cutwatercore@gmail.com>
This commit is contained in:
Proskurin Kirill 2017-01-16 15:18:58 +00:00
parent 2116784de0
commit e29ee11b65
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/calico-felix.yaml
View File

@ -16,6 +16,17 @@ service:
- neutron.conf - neutron.conf
- ml2-conf.ini - ml2-conf.ini
- felix.cfg - felix.cfg
# {% set int = neutron.bootstrap.internal %}
# {% if int.enable %}
# {% if neutron.plugin_agent == 'calico' %}
post:
- name: neutron-bootstrap-int-net-create
type: single
dependencies:
- neutron-server
command: openstack network create --provider-network-type local {{ int.net_name }}
# {% endif %}
# {% endif %}
files: files:
neutron.conf: neutron.conf:
path: /etc/neutron/neutron.conf path: /etc/neutron/neutron.conf

2
service/neutron-l3-agent.yaml
View File

@ -32,11 +32,13 @@ service:
# {% set int = neutron.bootstrap.internal %} # {% set int = neutron.bootstrap.internal %}
# {% if int.enable %} # {% if int.enable %}
# {% if neutron.plugin_agent == 'vxlan' %}
- name: neutron-bootstrap-int-net-create - name: neutron-bootstrap-int-net-create
type: single type: single
dependencies: dependencies:
- neutron-server - neutron-server
command: openstack network create --provider-network-type vxlan --provider-segment 77 {{ int.net_name }} command: openstack network create --provider-network-type vxlan --provider-segment 77 {{ int.net_name }}
# {% endif %}
- name: neutron-bootstrap-int-net-subnetpool-create - name: neutron-bootstrap-int-net-subnetpool-create
type: single type: single
dependencies: dependencies: