diff options
| author | Sam Yaple <sam@yaple.net> | 2015-07-23 19:17:20 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-07-23 21:05:11 +0000 |
| commit | 005ec9ee70ef7137ada7963bc65549bab690c9f0 (patch) | |
| tree | f20d69556e797cec8722897fd623d0fb755eacd2 /ansible | |
| parent | 922093044e7043d83ee16c278b856bb0a02604a2 (diff) | |
| download | kolla-005ec9ee70ef7137ada7963bc65549bab690c9f0.tar.gz kolla-005ec9ee70ef7137ada7963bc65549bab690c9f0.zip | |
Update init-runonce
This makes some changes to init-runonce to allow using Ansible as well as
updating it to use the openstack-client where applicable since the
keystone-client is not usable with keystone v3 api at all.
Change-Id: I6b9d6beb04df7724b1967638e98042ab03221cd1
Closes-Bug: #1477725
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/templates/ml2_conf.ini.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/neutron/templates/ml2_conf.ini.j2 b/ansible/roles/neutron/templates/ml2_conf.ini.j2 index 561ea3323..fde37c159 100644 --- a/ansible/roles/neutron/templates/ml2_conf.ini.j2 +++ b/ansible/roles/neutron/templates/ml2_conf.ini.j2 @@ -10,7 +10,7 @@ mechanism_drivers = openvswitch,l2population #network_vlan_ranges = external:1000:1999 [ml2_type_flat] -flat_networks = external +flat_networks = physnet1 [ml2_type_gre] tunnel_id_ranges = 1:1000 @@ -32,4 +32,4 @@ arp_responder = true [ovs] local_ip = {{ hostvars[inventory_hostname]['ansible_' + tunnel_interface]['ipv4']['address'] }} -bridge_mappings = external:{{ neutron_bridge_name }} +bridge_mappings = physnet1:{{ neutron_bridge_name }} |