From 12019717d3be5b4cfa42751cd19cbd42f82bc04a Mon Sep 17 00:00:00 2001
From: baigk <baiguoku@huawei.com>
Date: Thu, 11 Jun 2015 14:13:24 +0800
Subject: Add openstack HA installer code with ansible for compass adapter

patch 2: add service monitor and adjust monitor timelen

BGS-25

Change-Id: I4239576b3888a0a7f6b697fe7fffffb677ef7dab
Signed-off-by: baigk <baiguoku@huawei.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/openstack_juno/roles/neutron-controller/tasks/main.yml
 create mode 100644 compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml
 create mode 100644 compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml

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

diff --git a/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml b/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/main.yml
new file mode 100644
index 0000000..9c04d74
--- /dev/null
+++ b/compass/deploy/ansible/openstack_juno/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/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml b/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_config.yml
new file mode 100644
index 0000000..77cc29a
--- /dev/null
+++ b/compass/deploy/ansible/openstack_juno/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/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml b/compass/deploy/ansible/openstack_juno/roles/neutron-controller/tasks/neutron_install.yml
new file mode 100644
index 0000000..6165299
--- /dev/null
+++ b/compass/deploy/ansible/openstack_juno/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