summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/roles/common
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2015-11-11 23:57:32 +0800
committercarey.xu <carey.xuhan@huawei.com>2015-11-19 10:19:45 +0800
commit4251f3ca9b4271649f9670468529ba2b077269d0 (patch)
tree619d37247db604325ca63421e54733d8ae1d3096 /deploy/adapters/ansible/roles/common
parenta6baefba912112cfb226575fd79245baaa4c1219 (diff)
support FWaaS and VPNaaS
JIRA: COMPASS-149 Change-Id: Ib523580fb7a7a2cd62e4fabb27fd710361cdeef3 Signed-off-by: carey.xu <carey.xuhan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/common')
-rw-r--r--deploy/adapters/ansible/roles/common/tasks/main.yml9
-rw-r--r--deploy/adapters/ansible/roles/common/vars/RedHat.yml2
2 files changed, 5 insertions, 6 deletions
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