From 3fa627b6048c4aa17b4cf3d641a4ea60465c7cef Mon Sep 17 00:00:00 2001
From: Yifei Xue <xueyifei@huawei.com>
Date: Thu, 7 Dec 2017 17:08:26 +0800
Subject: 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>
---
 .../ansible/roles/config-osa/tasks/fix_rescue.yml  | 43 ++++++++++++++++++++++
 .../ansible/roles/config-osa/tasks/main.yml        | 18 +++++++++
 .../config-osa/templates/user_variables.yml.j2     |  2 +-
 3 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml

(limited to 'deploy/adapters/ansible/roles/config-osa')

diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml b/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml
new file mode 100644
index 00000000..eea06b48
--- /dev/null
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/fix_rescue.yml
@@ -0,0 +1,43 @@
+---
+
+- name: fix rescue problem for openstack-hosts-setup
+  blockinfile:
+    dest: "/opt/openstack-ansible/playbooks/openstack-hosts-setup.yml"
+    block: |
+      - hosts: localhost
+        user: root
+        tasks:
+          - name: Mark openstack-hosts-setup completed
+            shell: echo "Setup openstack-hosts-setup completed!"
+
+- name: delete max_fail_percentage for openstack-hosts-setup
+  lineinfile:
+    dest: "/opt/openstack-ansible/playbooks/openstack-hosts-setup.yml"
+    regexp: "max_fail_percentage*"
+    state: absent
+
+- name: fix rescue problem for security-hardening
+  blockinfile:
+    dest: "/opt/openstack-ansible/playbooks/security-hardening.yml"
+    block: |
+      - hosts: localhost
+        user: root
+        tasks:
+          - name: Mark security-hardening completed
+            shell: echo "Setup security-hardening completed!"
+
+- name: fix rescue problem for lxc-hosts-setup
+  blockinfile:
+    dest: "/opt/openstack-ansible/playbooks/lxc-hosts-setup.yml"
+    block: |
+      - hosts: localhost
+        user: root
+        tasks:
+          - name: Mark lxc-hosts-setup completed
+            shell: echo "Setup lxc-hosts-setup completed!"
+
+- name: delete max_fail_percentage for lxc-hosts-setup
+  lineinfile:
+    dest: "/opt/openstack-ansible/playbooks/lxc-hosts-setup.yml"
+    regexp: "max_fail_percentage*"
+    state: absent
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
diff --git a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
index a6e69683..88a3233b 100644
--- a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
+++ b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
@@ -62,4 +62,4 @@ neutron_provider_networks:
   network_mappings: "{{ ','.join(controller_mappings) }}"
 {% endif %}
 
-security_sshd_permit_root_login: no
+security_sshd_permit_root_login: yes
-- 
cgit 1.2.3-korg