diff options
Diffstat (limited to 'deploy/adapters/ansible/roles/config-osa/tasks/main.yml')
-rwxr-xr-x | deploy/adapters/ansible/roles/config-osa/tasks/main.yml | 43 |
1 files changed, 33 insertions, 10 deletions
diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml index 9b657fe9..ceceb956 100755 --- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml +++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml @@ -66,6 +66,19 @@ insertafter: '^ - qemu-img-ev' line: ' - libvirt' +- name: fix the problem of nova cell_v2 discovery + blockinfile: + dest: /etc/ansible/roles/os_nova/tasks/nova_db_post_setup.yml + insertafter: 'nova-manage cell_v2 discover_hosts' + block: | + # add retry + register: cell_v2_discovery + until: cell_v2_discovery == 0 + retries: 10 + delay: 5 + ignore_errors: true + when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'Ubuntu' + - name: remove CentOS-Base.repo after ceph-osd blockinfile: dest: /etc/ansible/roles/ceph-osd/tasks/start_osds.yml @@ -76,6 +89,25 @@ /etc/yum.repos.d/CentOS-Base.repo.bak; when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'CentOS' +- name: fix the problem in pip_install + blockinfile: + dest: /etc/ansible/roles/pip_install/tasks/pre_install_yum.yml + insertafter: 'pip_install_package_state' + block: | + # add retry + register: repo_result + until: repo_result | success + retries: 5 + delay: 10 + when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'CentOS' + +- name: update the directory of chrony key + lineinfile: + dest: /etc/ansible/roles/ansible-hardening/templates/chrony.conf.j2 + regexp: '^keyfile' + line: 'keyfile /etc/chrony.keys' + when: hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'CentOS' + - name: add mariadb local repository blockinfile: dest: /etc/openstack_deploy/user_variables.yml @@ -295,11 +327,6 @@ when: - "{{ hostvars[inventory_hostname]['groups']['controller'] | length < 2 }}" -- name: copy the repo_fix_andas.yml - template: - src: repo_fix_pandas.yml - dest: /etc/ansible/roles/repo_build/tasks/repo_fix_pandas.yml - # - name: change repore build # lineinfile: # dest: /etc/ansible/roles/repo_build/tasks/main.yml @@ -308,10 +335,6 @@ - include: meters.yml -- name: fix the python-ldap version - lineinfile: - dest: /etc/ansible/roles/os_keystone/defaults/main.yml - regexp: '^ - python-ldap' - line: ' - python-ldap==2.5.2' +- include: fix_pip_version.yml - include: fix_rescue.yml |