aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Duy Vũ (CBR09) <nguyenduyvu099@gmail.com>2015-10-08 16:28:10 +0700
committerVu Nguyen Duy <nguyenduyvu099@gmail.com>2015-10-09 23:43:02 +0700
commit44d110358765ce562a6ff45a65aa7c4ee72394db (patch)
treecd941b6bca91dd9b3bf2bd90124265ef181599c6
parente6a9da202297b0220a6e96ae12ed7c3fbab6e529 (diff)
downloadkolla-44d110358765ce562a6ff45a65aa7c4ee72394db.tar.gz
kolla-44d110358765ce562a6ff45a65aa7c4ee72394db.zip
Neutron-server should be on control group
It's convenient for tools/init-runonce work properly Closes-Bug: #1503999 backport: liberty Change-Id: I2d9f97e59ae4de3404f95a5231103cdd40a68835
-rw-r--r--ansible/inventory/multinode2
-rw-r--r--ansible/roles/neutron/tasks/config.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index cc643be11..63b9af66f 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -104,7 +104,7 @@ nova
# Neutron
[neutron-server:children]
-neutron
+control
[neutron-agents:children]
neutron
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index e7cc7b191..080ee7dd4 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -141,7 +141,7 @@
template:
src: "roles/neutron/templates/neutron-agents.json.j2"
dest: "{{ node_config_directory }}/neutron-agents/config.json"
- when: inventory_hostname in groups['neutron-server']
+ when: inventory_hostname in groups['neutron-agents']
- name: Copying Neutron Server JSON configuration file
template: