diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-09 17:28:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-09 17:28:23 +0000 |
| commit | fbf0daf1de6d0b300f615d6ab6c52a70f90ac9b7 (patch) | |
| tree | a6ef12e7decc7e52b0206390e61dff0d56ee0f64 | |
| parent | 67b9167abaeb83212127f8537045fa5ee5cbab4a (diff) | |
| parent | 44d110358765ce562a6ff45a65aa7c4ee72394db (diff) | |
| download | kolla-fbf0daf1de6d0b300f615d6ab6c52a70f90ac9b7.tar.gz kolla-fbf0daf1de6d0b300f615d6ab6c52a70f90ac9b7.zip | |
Merge "Neutron-server should be on control group"
| -rw-r--r-- | ansible/inventory/multinode | 2 | ||||
| -rw-r--r-- | 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 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 90ecf80ff..5a99aa95f 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -152,7 +152,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: |