support deployment openstack juno with ansible for compass in centos7.1

JIRA: COMPASS-6

Change-Id: I8ef865e8acfe29c3ff5c7e9030e4cebabed3457b
Signed-off-by: baigk <baiguoku@huawei.com>

6 files changed, 40 insertions, 37 deletions

diff --git a/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml b/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml
index 36d779dd..25d80040 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/handlers/main.yml
@@ -1,13 +1,4 @@
 ---
-- name: restart neutron-plugin-openvswitch-agent
-  service: name=neutron-plugin-openvswitch-agent state=restarted enabled=yes
-  when: "'opendaylight' not in {{ NEUTRON_MECHANISM_DRIVERS }}"
-
-- name: restart neutron-l3-agent
-  service: name=neutron-l3-agent state=restarted enabled=yes
-
-- name: restart neutron-dhcp-agent
-  service: name=neutron-dhcp-agent state=restarted enabled=yes
-
-- name: restart neutron-metadata-agent
-  service: name=neutron-metadata-agent state=restarted enabled=yes
+- name: restart neutron compute service
+  service: name={{ item }} state=restarted enabled=yes
+  with_items: services | union(services_noarch)
diff --git a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
index 3a811ecf..fbc41385 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml
@@ -14,39 +14,39 @@
           value=0 state=present reload=yes
 
 - name: install compute-related neutron packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: packages
+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
+  with_items: packages | union(packages_noarch)
 
-- name: install neutron openvswitch agent
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present force=yes"
-  with_items: neutron_plugin_openvswitch_agent_packages
-  when: "'opendaylight' not in {{ NEUTRON_MECHANISM_DRIVERS }}"
+- name: fix openstack neutron plugin config file
+  shell: |
+    sed -i 's,plugins/openvswitch/ovs_neutron_plugin.ini,plugin.ini,g' /usr/lib/systemd/system/neutron-openvswitch-agent.service
+    systemctl daemon-reload
+  when: ansible_os_family == 'RedHat'
 
-- name: generate neutron computer service list
+- name: generate neutron compute service list
   shell: echo {{ item }} >> /opt/service
-  with_items: neutron-plugin-openvswitch-agent-services
-  when: "'opendaylight' not in {{ NEUTRON_MECHANISM_DRIVERS }}"
-
-- name: config neutron
-  template: src=neutron-network.conf
-            dest=/etc/neutron/neutron.conf backup=yes
-  notify:
-    - restart neutron-plugin-openvswitch-agent
+  with_items: services | union(services_noarch)
 
 - name: config ml2 plugin
   template: src=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
+
+- name: config neutron
+  template: src=neutron-network.conf
+            dest=/etc/neutron/neutron.conf backup=yes
   notify:
-    - restart neutron-plugin-openvswitch-agent
+    - restart neutron compute service
+    - restart nova-compute services
+
+- meta: flush_handlers
 
 - name: add br-int
   openvswitch_bridge: bridge=br-int state=present
-  notify:
-    - restart neutron-plugin-openvswitch-agent
-    - restart nova-compute
 
 - include: ../../neutron-network/tasks/odl.yml
   when: "'opendaylight' in {{ NEUTRON_MECHANISM_DRIVERS }}"
 
-- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/neutron-compute/templates/nova.conf b/deploy/adapters/ansible/roles/neutron-compute/templates/nova.conf
index 4988cb03..4706d1db 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/templates/nova.conf
+++ b/deploy/adapters/ansible/roles/neutron-compute/templates/nova.conf
@@ -3,7 +3,7 @@ dhcpbridge_flagfile=/etc/nova/nova.conf
 dhcpbridge=/usr/bin/nova-dhcpbridge
 logdir=/var/log/nova
 state_path=/var/lib/nova
-lock_path=/var/lock/nova
+lock_path=/var/lib/nova/tmp
 force_dhcp_release=True
 iscsi_helper=tgtadm
 libvirt_use_virtio_for_bridges=True
diff --git a/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml b/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml
index cea31b3a..9c58b36b 100644
--- a/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/neutron-compute/vars/Debian.yml
@@ -1,12 +1,11 @@
 ---
+
 packages:
   - neutron-common
   - neutron-plugin-ml2
   - openvswitch-datapath-dkms
   - openvswitch-switch
-
-neutron_plugin_openvswitch_agent_packages:
   - neutron-plugin-openvswitch-agent
 
-neutron-plugin-openvswitch-agent-services:
-  - "neutron-plugin-openvswitch-agent"
+services:
+  - neutron-plugin-openvswitch-agent
diff --git a/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml b/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml
new file mode 100644
index 00000000..cf882150
--- /dev/null
+++ b/deploy/adapters/ansible/roles/neutron-compute/vars/RedHat.yml
@@ -0,0 +1,9 @@
+---
+packages:
+  - openstack-neutron-ml2
+  - openstack-neutron-openvswitch
+
+services:
+  - openvswitch
+  - neutron-openvswitch-agent
+  - libvirtd
diff --git a/deploy/adapters/ansible/roles/neutron-compute/vars/main.yml b/deploy/adapters/ansible/roles/neutron-compute/vars/main.yml
new file mode 100644
index 00000000..d43b8359
--- /dev/null
+++ b/deploy/adapters/ansible/roles/neutron-compute/vars/main.yml
@@ -0,0 +1,4 @@
+---
+packages_noarch: []
+
+services_noarch: []