From 543130927ba40a174e8674cca66ae442d5056d76 Mon Sep 17 00:00:00 2001
From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Sat, 3 Oct 2015 17:34:24 +0200
Subject: Moving tag arno.2015.2.0 from genesis to fuel/stable/arno

Change-Id: I01b5f9f9125756d80d7ca666bb6d994f2b13d2a0
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
---
 .../roles/neutron-controller/tasks/main.yml        | 13 ++++++++++
 .../neutron-controller/tasks/neutron_config.yml    | 10 ++++++++
 .../neutron-controller/tasks/neutron_install.yml   | 29 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 compass/deploy/ansible/roles/neutron-controller/tasks/main.yml
 create mode 100644 compass/deploy/ansible/roles/neutron-controller/tasks/neutron_config.yml
 create mode 100644 compass/deploy/ansible/roles/neutron-controller/tasks/neutron_install.yml

(limited to 'compass/deploy/ansible/roles/neutron-controller/tasks')

diff --git a/compass/deploy/ansible/roles/neutron-controller/tasks/main.yml b/compass/deploy/ansible/roles/neutron-controller/tasks/main.yml
new file mode 100644
index 000000000..9c04d74e0
--- /dev/null
+++ b/compass/deploy/ansible/roles/neutron-controller/tasks/main.yml
@@ -0,0 +1,13 @@
+---
+- include: neutron_install.yml
+  tags:
+    - install
+    - neutron_install
+    - neutron 
+
+- include: neutron_config.yml
+  when: HA_CLUSTER is not defined or HA_CLUSTER[inventory_hostname] == ''
+  tags:
+    - config
+    - neutron_config
+    - neutron
diff --git a/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_config.yml b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_config.yml
new file mode 100644
index 000000000..77cc29ae4
--- /dev/null
+++ b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_config.yml
@@ -0,0 +1,10 @@
+---
+- 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
+  until: result.rc == 0
+  retries: 5
+  delay: 3
+  notify:
+    - restart neutron-server
+
diff --git a/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_install.yml b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_install.yml
new file mode 100644
index 000000000..616529939
--- /dev/null
+++ b/compass/deploy/ansible/roles/neutron-controller/tasks/neutron_install.yml
@@ -0,0 +1,29 @@
+---
+- name: install controller-related neutron packages
+  apt: name={{ item }} state=present force=yes
+  with_items:
+    - neutron-server
+    - neutron-plugin-ml2
+
+- name: generate neutron controll service list
+  shell: echo {{ item }} >> /opt/service
+  with_items:
+    - neutron-server
+    - neutron-plugin-ml2
+
+- name: get tenant id to fill neutron.conf
+  shell: keystone --os-token={{ ADMIN_TOKEN }} --os-endpoint=http://{{ HA_VIP }}:35357/v2.0 tenant-get service | grep id | awk '{print $4}'
+  register: NOVA_ADMIN_TENANT_ID
+
+- name: update neutron conf
+  template: src=neutron.conf dest=/etc/neutron/neutron.conf backup=yes
+  notify:
+    - restart neutron-server
+
+- name: update ml2 plugin conf
+  template: src=ml2_conf.ini dest=/etc/neutron/plugins/ml2/ml2_conf.ini backup=yes
+  notify:
+    - restart neutron-server
+
+- meta: flush_handlers
+
-- 
cgit 1.2.3-korg