diff options
author | Yifei Xue <xueyifei@huawei.com> | 2017-12-07 17:08:26 +0800 |
---|---|---|
committer | Yifei Xue <xueyifei@huawei.com> | 2017-12-08 09:01:58 +0800 |
commit | 3fa627b6048c4aa17b4cf3d641a4ea60465c7cef (patch) | |
tree | d1b8aee4968dafbc07bc96ddf5abd8093bbb2a86 /deploy/adapters/ansible/roles/config-osa/tasks/main.yml | |
parent | 51ce441ca60cd115d9e8a932203ccc9d3cebcf82 (diff) |
Add CentOS 7.4 support for OpenStack Pike
JIRA: COMPASS-565
After this patch merged, compass can deploy OpenStack Pike on
CentOS 7.4. Due to some upstream bugs, we add some fixes in
this patch, e.g. add libvirt to os-cinder, remove a useless
repo after installing
Change-Id: Ibc1e6f1ed103daf2d70a8ae1d7c04f77d1545c41
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa/tasks/main.yml')
-rwxr-xr-x | deploy/adapters/ansible/roles/config-osa/tasks/main.yml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index cdf11421..046b25e5 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -47,6 +47,22 @@ - offline_deployment is defined and offline_deployment == "Disable" - hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'Ubuntu' +- name: add libvirt into cinder packages + lineinfile: + dest: /etc/ansible/roles/os_cinder/vars/redhat-7.yml + insertafter: '^ - qemu-img-ev' + line: ' - libvirt' + +- name: remove CentOS-Base.repo after ceph-osd + blockinfile: + dest: /etc/ansible/roles/ceph-osd/tasks/start_osds.yml + block: | + - name: remove empty yum base repo + shell: | + mv /etc/yum.repos.d/CentOS-Base.repo \ + /etc/yum.repos.d/CentOS-Base.repo.bak; + when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'CentOS' + - name: add mariadb local repository blockinfile: dest: /etc/openstack_deploy/user_variables.yml @@ -284,3 +300,5 @@ dest: /etc/ansible/roles/os_keystone/defaults/main.yml regexp: '^ - python-ldap' line: ' - python-ldap==2.5.2' + +- include: fix_rescue.yml |