diff options
| author |   baigk <baiguoku@huawei.com> | 2015-11-09 00:37:19 -0800 |
|---|---|---|
| committer | baigk <baiguoku@huawei.com> | 2015-11-16 07:03:05 +0000 |
| commit | cb5ae68b968f28c1cedee3720ff14cf5fa1ab92c (patch) | |
| tree | 74c81a96b8a76de1b5e67e4a2f7097f643ad6709 /deploy/adapters/ansible/roles/common | |
| parent | e28554faea569b5e6d15b3816df702e664b5bba4 (diff) | |
suport installing openstack kilo on centos 7
JIRA: COMPASS-141
Change-Id: I8b4eeacd802124cd05d17c7c24682254f0c567f7
Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/common')
| -rw-r--r-- | deploy/adapters/ansible/roles/common/tasks/main.yml | 7 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/common/vars/Debian.yml | 4 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/common/vars/RedHat.yml | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/roles/common/tasks/main.yml b/deploy/adapters/ansible/roles/common/tasks/main.yml index 04a18a83..3114e638 100644 --- a/deploy/adapters/ansible/roles/common/tasks/main.yml +++ b/deploy/adapters/ansible/roles/common/tasks/main.yml @@ -5,6 +5,11 @@ 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 @@ -35,7 +40,7 @@ file: path=~/.pip state=directory - name: update pip.conf - template: src=pip.conf dest=~/.pip/pip.conf + template: src=pip.conf dest=~/.pip/{{ pip_conf }} - name: update ntp conf template: src=ntp.conf dest=/etc/ntp.conf backup=yes diff --git a/deploy/adapters/ansible/roles/common/vars/Debian.yml b/deploy/adapters/ansible/roles/common/vars/Debian.yml index c471d148..bc273a10 100644 --- a/deploy/adapters/ansible/roles/common/vars/Debian.yml +++ b/deploy/adapters/ansible/roles/common/vars/Debian.yml @@ -6,6 +6,10 @@ packages: - openvswitch-switch - crudini +pip_packages: [] + +pip_conf: pip.conf + services: [] ntp_service: ntp diff --git a/deploy/adapters/ansible/roles/common/vars/RedHat.yml b/deploy/adapters/ansible/roles/common/vars/RedHat.yml index 57172b7f..10aa7715 100644 --- a/deploy/adapters/ansible/roles/common/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/common/vars/RedHat.yml @@ -1,8 +1,12 @@ --- packages: - - python-devel - openvswitch +pip_packages: + - crudini + +pip_conf: .pip.conf + services: - openvswitch |