diff options
| -rw-r--r-- | build/os/centos/rhel7/mitaka/Dockerfile.tmpl | 2 | ||||
| -rw-r--r-- | build/templates/RedHat_mitaka.tmpl | 27 | ||||
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka/roles/ceph-purge/tasks/main.yml | 37 |
3 files changed, 42 insertions, 24 deletions
diff --git a/build/os/centos/rhel7/mitaka/Dockerfile.tmpl b/build/os/centos/rhel7/mitaka/Dockerfile.tmpl index adb930ff..2ea2b828 100644 --- a/build/os/centos/rhel7/mitaka/Dockerfile.tmpl +++ b/build/os/centos/rhel7/mitaka/Dockerfile.tmpl @@ -1,4 +1,4 @@ -FROM centos:7.1.1503 +FROM centos:7.2.1511 MAINTAINER Chigang(Justin) <chigang@huawei.com> # set cache enable diff --git a/build/templates/RedHat_mitaka.tmpl b/build/templates/RedHat_mitaka.tmpl index 07728289..4d6b26fd 100644 --- a/build/templates/RedHat_mitaka.tmpl +++ b/build/templates/RedHat_mitaka.tmpl @@ -10,11 +10,12 @@ yum repolist yum clean all yum install yum-plugin-priorities -y -yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-6.noarch.rpm -y -yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-${OPV}.rpm -y +# yum install http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-6.noarch.rpm -y +# yum install http://rdo.fedorapeople.org/openstack-$OPV/rdo-release-${OPV}.rpm -y +yum install -y centos-release-openstack-${OPV} # modify centos7 repo for workaround -sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo +# sed -i 's/epel-Derived from Red Hat Enterprise Linux 7.1 (Source)/epel-7/g' /etc/yum.repos.d/rdo-release.repo # add mongodb repo cat <<EOF >/etc/yum.repos.d/mongodb.repo @@ -44,26 +45,6 @@ gpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon protect=1 EOF -cat <<EOF >/etc/yum.repos.d/ceph.repo -[ceph] -name=Ceph packages for x86_64 -baseurl=http://ceph.com/rpm-hammer/rhel7/x86_64 -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc - -[ceph-noarch] -name=Ceph noarch packages -baseurl=http://ceph.com/rpm-hammer/rhel7/noarch -enabled=1 -priority=2 -gpgcheck=1 -type=rpm-md -gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc -EOF - cat <<EOF >>/etc/yum.conf exclude=mongodb-org,mongodb-org-server EOF diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/ceph-purge/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/ceph-purge/tasks/main.yml new file mode 100644 index 00000000..02013762 --- /dev/null +++ b/deploy/adapters/ansible/openstack_mitaka/roles/ceph-purge/tasks/main.yml @@ -0,0 +1,37 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +- name: clear tmp files + local_action: shell rm -rf /tmp/ceph* + tags: + - ceph_purge + - ceph_deploy + +- name: install ceph-related packages + action: "{{ ansible_pkg_mgr }} name={{ item }} state=present" + with_items: + - ceph-deploy + tags: + - ceph_purge + - ceph_deploy + when: ansible_os_family == "Debian" + +- name: purge ceph + shell: "ceph-deploy purge {{ inventory_hostname }}; ceph-deploy purgedata {{ inventory_hostname }}; ceph-deploy forgetkeys" + tags: + - ceph_purge + - ceph_deploy + when: ansible_os_family == "Debian" + +- name: remove monmap + file: path="/tmp/monmap" state="absent" + tags: + - ceph_purge + - ceph_deploy + + |