From 43dcf3ba2ed1a0f9254d533e091324eb9e1164dd Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Mon, 14 Mar 2016 11:26:02 +0800 Subject: disable service autostart when install packages on ubuntu JIRA: COMPASS-336 Change-Id: I36c4e53d8c43231890bf29e678c38e2a22b33788 Signed-off-by: carey.xu --- .../ansible/roles/neutron-network/tasks/firewall.yml | 13 +++++++++++++ .../adapters/ansible/roles/neutron-network/tasks/main.yml | 13 +++++++++++++ deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml | 13 +++++++++++++ 3 files changed, 39 insertions(+) (limited to 'deploy/adapters/ansible/roles/neutron-network') diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml index c0246663..aec714f3 100755 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml +++ b/deploy/adapters/ansible/roles/neutron-network/tasks/firewall.yml @@ -9,9 +9,22 @@ --- - include_vars: "{{ ansible_os_family }}.yml" +- name: disable auto start + copy: + content: "#!/bin/sh\nexit 101" + dest: "/usr/sbin/policy-rc.d" + mode: 0755 + when: ansible_os_family == "Debian" + - name: install firewall packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" with_items: firewall_packages +- name: enable auto start + file: + path=/usr/sbin/policy-rc.d + state=absent + when: ansible_os_family == "Debian" + - name: update firewall related conf shell: crudini --set --list /etc/neutron/neutron.conf DEFAULT service_plugins firewall diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml index 924a02e5..9b41ac18 100644 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml +++ b/deploy/adapters/ansible/roles/neutron-network/tasks/main.yml @@ -31,10 +31,23 @@ failed_when: iproute_out.rc == 255 when: "'vxlan' in {{ NEUTRON_TUNNEL_TYPES }}" +- name: disable auto start + copy: + content: "#!/bin/sh\nexit 101" + dest: "/usr/sbin/policy-rc.d" + mode: 0755 + when: ansible_os_family == "Debian" + - name: install neutron network related packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" with_items: packages | union(packages_noarch) +- name: enable auto start + file: + path=/usr/sbin/policy-rc.d + state=absent + when: ansible_os_family == "Debian" + - name: generate neutron network service list lineinfile: dest=/opt/service create=yes line='{{ item }}' with_items: services | union(services_noarch) diff --git a/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml b/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml index 896b4358..9722ab7c 100755 --- a/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml +++ b/deploy/adapters/ansible/roles/neutron-network/tasks/vpn.yml @@ -9,10 +9,23 @@ --- - include_vars: "{{ ansible_os_family }}.yml" +- name: disable auto start + copy: + content: "#!/bin/sh\nexit 101" + dest: "/usr/sbin/policy-rc.d" + mode: 0755 + when: ansible_os_family == "Debian" + - name: install vpn packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" with_items: vpn_packages +- name: enable auto start + file: + path=/usr/sbin/policy-rc.d + state=absent + when: ansible_os_family == "Debian" + - name: update vpn related conf shell: crudini --set /etc/neutron/l3_agent.ini vpnagent vpn_device_driver neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver; crudini --set --list /etc/neutron/neutron.conf DEFAULT service_plugins vpnaas -- cgit 1.2.3-korg