diff options
| author |   baigk <baiguoku@huawei.com> | 2015-08-06 02:37:33 -0400 |
|---|---|---|
| committer | baigk <baiguoku@huawei.com> | 2015-08-09 22:47:56 -0400 |
| commit | 87612abc0e24cafd89a49e350165b08fe1608233 (patch) | |
| tree | 07b156c0268fd189f92e8a0730118edc51b8073f /deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml | |
| parent | 5aedf594112c0749b6e9039d15b9fe70d210a942 (diff) | |
support deployment openstack juno with ansible for compass in centos7.1
JIRA: COMPASS-6
Change-Id: I8ef865e8acfe29c3ff5c7e9030e4cebabed3457b
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml')
| -rw-r--r-- | deploy/adapters/ansible/roles/neutron-compute/tasks/main.yml | 40 |
1 files changed, 20 insertions, 20 deletions
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 |