From 4251f3ca9b4271649f9670468529ba2b077269d0 Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Wed, 11 Nov 2015 23:57:32 +0800 Subject: support FWaaS and VPNaaS JIRA: COMPASS-149 Change-Id: Ib523580fb7a7a2cd62e4fabb27fd710361cdeef3 Signed-off-by: carey.xu --- deploy/adapters/ansible/roles/common/tasks/main.yml | 9 ++++----- deploy/adapters/ansible/roles/common/vars/RedHat.yml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'deploy/adapters/ansible/roles/common') diff --git a/deploy/adapters/ansible/roles/common/tasks/main.yml b/deploy/adapters/ansible/roles/common/tasks/main.yml index 3114e638..3097d092 100644 --- a/deploy/adapters/ansible/roles/common/tasks/main.yml +++ b/deploy/adapters/ansible/roles/common/tasks/main.yml @@ -5,11 +5,6 @@ apt: pkg=landscape-common state=absent purge=yes when: ansible_os_family == "Debian" - -- name: install pip packages - pip: name={{ item }} state=present extra_args='--pre' - with_items: pip_packages - - name: update hosts files to all hosts template: src=hosts dest=/etc/hosts backup=yes @@ -42,6 +37,10 @@ - name: update pip.conf template: src=pip.conf dest=~/.pip/{{ pip_conf }} +- name: install pip packages + pip: name={{ item }} state=present extra_args='--pre' + with_items: pip_packages + - name: update ntp conf template: src=ntp.conf dest=/etc/ntp.conf backup=yes diff --git a/deploy/adapters/ansible/roles/common/vars/RedHat.yml b/deploy/adapters/ansible/roles/common/vars/RedHat.yml index 10aa7715..6618748f 100644 --- a/deploy/adapters/ansible/roles/common/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/common/vars/RedHat.yml @@ -5,7 +5,7 @@ packages: pip_packages: - crudini -pip_conf: .pip.conf +pip_conf: pip.conf services: - openvswitch -- cgit 1.2.3-korg