diff options
| author |   Justin chi <chigang@huawei.com> | 2015-11-19 08:02:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-11-19 08:02:05 +0000 |
| commit | a5d9a6384c09ff8e84c7e6bfefb9b9202b0c2341 (patch) | |
| tree | 619d37247db604325ca63421e54733d8ae1d3096 /deploy/adapters/ansible/roles/common | |
| parent | be2bef457417df3aabcf371c8c8b9484c955c0f8 (diff) | |
| parent | 4251f3ca9b4271649f9670468529ba2b077269d0 (diff) | |
Merge "support FWaaS and VPNaaS"
Diffstat (limited to 'deploy/adapters/ansible/roles/common')
| -rw-r--r-- | deploy/adapters/ansible/roles/common/tasks/main.yml | 9 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/common/vars/RedHat.yml | 2 |
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 |