diff options
| author |   shuai chen <chenshuai@huawei.com> | 2016-02-26 00:56:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-02-26 00:56:23 +0000 |
| commit | 13844327bc53f672389f7372e5ee0660d79fd761 (patch) | |
| tree | a84a3ff0f0e810aa1132dd4b575a8f1b929855b0 /deploy/adapters/ansible | |
| parent | 553eb40cc40c0a5c1727bc8237932426ea790154 (diff) | |
| parent | cf09c45a4a47fdf1fa86dff4af45a64ba10597d5 (diff) | |
Merge "Fix: CEPH issues on centos7"
Diffstat (limited to 'deploy/adapters/ansible')
| -rw-r--r-- | deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml | 2 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/common/tasks/main.yml | 10 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/common/vars/RedHat.yml | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml index 5c637a2e..e7e4a242 100644 --- a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml +++ b/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml @@ -28,6 +28,6 @@ when: ansible_os_family == "Debian" - name: rebuild osd after reboot for centos - lineinfile: dest=/usr/init.d/ceph insertafter="^### END INIT INFO" line="\nsleep 1\nmount /dev/storage-volumes/ceph0 /var/local/osd" + lineinfile: dest=/etc/init.d/ceph insertafter="^### END INIT INFO" line="\nsleep 1\nmount /dev/storage-volumes/ceph0 /var/local/osd" when: ansible_os_family == "RedHat" diff --git a/deploy/adapters/ansible/roles/common/tasks/main.yml b/deploy/adapters/ansible/roles/common/tasks/main.yml index d195703a..f004e98d 100644 --- a/deploy/adapters/ansible/roles/common/tasks/main.yml +++ b/deploy/adapters/ansible/roles/common/tasks/main.yml @@ -29,6 +29,16 @@ echo "# compass" >> /etc/hosts echo {{ COMPASS_SERVER.stdout_lines[0] }} {{ name.stdout_lines[0] }} >> /etc/hosts +- name: install python-crypto + yum: name=python-crypto state=present + register: python_crypto_result + ignore_errors: yes + when: ansible_os_family == "RedHat" + +- name: remove python crypt egg file to work-around https://bugs.centos.org/view.php?id=9896&nbn=2 + shell: rm -rf /usr/lib64/python2.7/site-packages/pycrypto-2.6.1-py2.7.egg-info + when: ansible_os_family == "RedHat" and python_crypto_result.msg == "Error unpacking rpm package python2-crypto-2.6.1-9.el7.x86_64\n" + - name: install packages action: "{{ ansible_pkg_mgr }} name={{ item }} state=latest update_cache=yes" with_items: packages | union(packages_noarch) diff --git a/deploy/adapters/ansible/roles/common/vars/RedHat.yml b/deploy/adapters/ansible/roles/common/vars/RedHat.yml index 50102c58..8143e1cb 100644 --- a/deploy/adapters/ansible/roles/common/vars/RedHat.yml +++ b/deploy/adapters/ansible/roles/common/vars/RedHat.yml @@ -12,6 +12,8 @@ packages: - python-devel - python-memcached - gcc + - redhat-lsb-core + - python-crypto pip_packages: - crudini |