Properly use all configs with neutron
Change-Id: Ie347964d42e7060c69047b1aeece1cf0ad311ae6 Partially-Implements: blueprint ansible-service
This commit is contained in:
parent
63035f7ce4
commit
d1f2ec8c8a
@ -51,6 +51,42 @@
|
||||
config_dest: "{{ node_config_directory }}/{{ service_name }}/neutron.conf"
|
||||
when: inventory_hostname in groups['neutron-agents']
|
||||
|
||||
- include: ../../config.yml
|
||||
vars:
|
||||
service_name: "neutron-agents"
|
||||
config_source:
|
||||
- "roles/{{ project_name }}/templates/dhcp_agent.ini.j2"
|
||||
- "/etc/kolla/config/{{ project_name }}/dhcp_agent.ini"
|
||||
config_template_dest:
|
||||
- "{{ node_templates_directory }}/{{ service_name }}/dhcp_agent.ini_minimal"
|
||||
- "{{ node_templates_directory }}/{{ service_name }}/dhcp_agent.ini_augment"
|
||||
config_dest: "{{ node_config_directory }}/{{ service_name }}/dhcp_agent.ini"
|
||||
when: inventory_hostname in groups['neutron-agents']
|
||||
|
||||
- include: ../../config.yml
|
||||
vars:
|
||||
service_name: "neutron-agents"
|
||||
config_source:
|
||||
- "roles/{{ project_name }}/templates/l3_agent.ini.j2"
|
||||
- "/etc/kolla/config/{{ project_name }}/l3_agent.ini"
|
||||
config_template_dest:
|
||||
- "{{ node_templates_directory }}/{{ service_name }}/l3_agent.ini_minimal"
|
||||
- "{{ node_templates_directory }}/{{ service_name }}/l3_agent.ini_augment"
|
||||
config_dest: "{{ node_config_directory }}/{{ service_name }}/l3_agent.ini"
|
||||
when: inventory_hostname in groups['neutron-agents']
|
||||
|
||||
- include: ../../config.yml
|
||||
vars:
|
||||
service_name: "neutron-agents"
|
||||
config_source:
|
||||
- "roles/{{ project_name }}/templates/metadata_agent.ini.j2"
|
||||
- "/etc/kolla/config/{{ project_name }}/metadata_agent.ini"
|
||||
config_template_dest:
|
||||
- "{{ node_templates_directory }}/{{ service_name }}/metadata_agent.ini_minimal"
|
||||
- "{{ node_templates_directory }}/{{ service_name }}/metadata_agent.ini_augment"
|
||||
config_dest: "{{ node_config_directory }}/{{ service_name }}/metadata_agent.ini"
|
||||
when: inventory_hostname in groups['neutron-agents']
|
||||
|
||||
- include: ../../config.yml
|
||||
vars:
|
||||
service_name: "neutron-agents"
|
||||
|
@ -37,6 +37,7 @@
|
||||
container_privileged: "True"
|
||||
container_volumes:
|
||||
- "/run:/run"
|
||||
- "/lib/modules:/lib/modules:ro"
|
||||
- "{{ node_config_directory }}/neutron-openvswitch-agent/:/opt/kolla/neutron-openvswitch-agent/:ro"
|
||||
when: inventory_hostname in groups['compute'] or
|
||||
inventory_hostname in groups['neutron-agents']
|
||||
@ -59,7 +60,6 @@
|
||||
KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
|
||||
container_image: "{{ docker_neutron_server_image_full }}"
|
||||
container_name: "neutron_server"
|
||||
container_privileged: "True"
|
||||
container_volumes:
|
||||
- "{{ node_config_directory }}/neutron-server/:/opt/kolla/neutron-server/:ro"
|
||||
when: inventory_hostname in groups['neutron-server']
|
||||
|
@ -1,4 +1,4 @@
|
||||
[DEFAULT]
|
||||
# DHCP Agent
|
||||
dnsmasq_config_file = /etc/neutron/dnsmasq.conf
|
||||
#dnsmasq_config_file = /etc/neutron/dnsmasq.conf
|
||||
dhcp_delete_namespaces = true
|
||||
|
@ -7,10 +7,10 @@ tenant_network_types = vxlan
|
||||
mechanism_drivers = openvswitch,l2population
|
||||
|
||||
[ml2_type_vlan]
|
||||
network_vlan_ranges = external:1000:1999
|
||||
#network_vlan_ranges = external:1000:1999
|
||||
|
||||
[ml2_type_flat]
|
||||
#flat_networks = external
|
||||
flat_networks = external
|
||||
|
||||
[ml2_type_gre]
|
||||
tunnel_id_ranges = 1:1000
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-dhcp-agent/neutron.conf /opt/kolla/neutron-dhcp-agent/dhcp_agent.ini /opt/kolla/neutron-dhcp-agent/dnsmasq.conf"
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/dhcp_agent.ini /opt/kolla/neutron-agents/dnsmasq.conf"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
SOURCES="/opt/kolla/neutron-metadata-agent/neutron.conf /opt/kolla/neutron-metadata-agent/metadata_agent.ini"
|
||||
SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/metadata_agent.ini"
|
||||
TARGET="/etc/neutron/"
|
||||
OWNER="neutron"
|
||||
|
||||
|
0
etc/kolla/config/neutron/dhcp_agent.ini
Normal file
0
etc/kolla/config/neutron/dhcp_agent.ini
Normal file
0
etc/kolla/config/neutron/l3_agent.ini
Normal file
0
etc/kolla/config/neutron/l3_agent.ini
Normal file
0
etc/kolla/config/neutron/metadata_agent.ini
Normal file
0
etc/kolla/config/neutron/metadata_agent.ini
Normal file
Loading…
Reference in New Issue
Block a user