openstack/openstack-ansible
Code Issues Proposed changes

Do not apply force flag to git.reset

Browse Source 
Return applying force flag to all distros. Instead we don't apply force
flag for `git reset` command at all.

Change-Id: I81556c641f891773474644f842ff3b07493e8715
This commit is contained in:
Dmitriy Rabotyagov 2021-02-15 17:02:11 +02:00
parent fcd5b4c1a9
commit c7dbdf8e11
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/library/git_requirements.py
View File

@ -121,8 +121,7 @@ def reset_to_version(path, version, reset_type='--hard', force=False,
return ["Failed to fetch %s\n%s" % (modify_repo.working_dir, str(e))] return ["Failed to fetch %s\n%s" % (modify_repo.working_dir, str(e))]
try: try:
modify_repo.git.reset(reset_type, version, modify_repo.git.reset(reset_type, version, refspec=refspec)
force=force, refspec=refspec)
except Exception as e: except Exception as e:
return ["Failed to reset %s\n%s" % (modify_repo.working_dir, str(e))] return ["Failed to reset %s\n%s" % (modify_repo.working_dir, str(e))]

2
scripts/get-ansible-role-requirements.yml
View File

@ -130,7 +130,7 @@
repo_info: "{{ clone_roles }}" repo_info: "{{ clone_roles }}"
retries: "{{ git_clone_retries }}" retries: "{{ git_clone_retries }}"
delay: "{{ git_clone_retry_delay }}" delay: "{{ git_clone_retry_delay }}"
force: "{{ not (ansible_distribution | lower == 'ubuntu' and ansible_distribution_version is version('20.04', '>=')) }}" force: true
core_multiplier: 4 core_multiplier: 4
rescue: rescue:
- name: Clone git repos (with git) - name: Clone git repos (with git)