From 44d110358765ce562a6ff45a65aa7c4ee72394db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Duy=20V=C5=A9=20=28CBR09=29?= Date: Thu, 8 Oct 2015 16:28:10 +0700 Subject: [PATCH] Neutron-server should be on control group It's convenient for tools/init-runonce work properly Closes-Bug: #1503999 backport: liberty Change-Id: I2d9f97e59ae4de3404f95a5231103cdd40a68835 --- ansible/inventory/multinode | 2 +- ansible/roles/neutron/tasks/config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index cc643be11e..63b9af66fa 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 e7cc7b1916..080ee7dd4f 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: