summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/neutron-controller
diff options
context:
space:
mode:
authoryour name <email@163.com>2015-09-09 03:26:11 -0400
committeryour name <email@163.com>2015-09-09 03:26:11 -0400
commit72039e915d1fc960bd0d7fccd910ea282d61bee7 (patch)
tree60452129b1b9f3c3419b4a29a038f5f0cbade5f7 /deploy/adapters/ansible/roles/neutron-controller
parentcf87d3067a63cb8be315a3addfd9c27d86be3b5a (diff)
Compass Netconfig optimization
Change-Id: Icbcfc7d794623436f22be5f6763b212a25d4fac7 JIRA: COMPASS-30
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-controller')
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/handlers/main.yml1
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml1
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml7
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml2
-rw-r--r--deploy/adapters/ansible/roles/neutron-controller/vars/RedHat.yml3
5 files changed, 10 insertions, 4 deletions
diff --git a/deploy/adapters/ansible/roles/neutron-controller/handlers/main.yml b/deploy/adapters/ansible/roles/neutron-controller/handlers/main.yml
index a9d9bd18..844718ff 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/handlers/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/handlers/main.yml
@@ -2,3 +2,4 @@
- name: restart neutron control services
service: name={{ item }} state=restarted enabled=yes
with_items: services | union(services_noarch)
+ when: item != "neutron-server"
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
index 5ac1e045..5b3640d7 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/main.yml
@@ -6,7 +6,6 @@
- neutron
- include: neutron_config.yml
- when: HA_CLUSTER is not defined or HA_CLUSTER[inventory_hostname] == ''
tags:
- config
- neutron_config
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
index c575b328..991e33cc 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_config.yml
@@ -2,10 +2,17 @@
- name: neutron-db-manage upgrade to Juno
shell: neutron-db-manage --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini upgrade head
register: result
+ run_once: True
until: result.rc == 0
retries: 5
delay: 3
notify:
- restart neutron control services
+- name: restart neutron-server
+ service: name=neutron-server state=restarted enabled=yes
+ delegate_to: "{{ item }}"
+ run_once: True
+ with_items: groups['controller']
+
- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml
index 96f17231..9655c0b3 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/tasks/neutron_install.yml
@@ -17,7 +17,7 @@
template: src=templates/neutron.conf dest=/etc/neutron/neutron.conf backup=yes
- name: update ml2 plugin conf
- template: src=ml2_conf.ini dest=/etc/neutron/plugins/ml2/ml2_conf.ini backup=yes
+ template: src=templates/ml2_conf.ini dest=/etc/neutron/plugins/ml2/ml2_conf.ini backup=yes
- name: ln plugin.ini
file: src=/etc/neutron/plugins/ml2/ml2_conf.ini dest=/etc/neutron/plugin.ini state=link
diff --git a/deploy/adapters/ansible/roles/neutron-controller/vars/RedHat.yml b/deploy/adapters/ansible/roles/neutron-controller/vars/RedHat.yml
index 14eb730c..24557b4e 100644
--- a/deploy/adapters/ansible/roles/neutron-controller/vars/RedHat.yml
+++ b/deploy/adapters/ansible/roles/neutron-controller/vars/RedHat.yml
@@ -3,5 +3,4 @@ packages:
- openstack-neutron
- openstack-neutron-ml2
-services:
- - neutron-server
+services: []