From afb72b70b8039ce752339790c1b4d7d7fad649d0 Mon Sep 17 00:00:00 2001 From: Byron McCollum Date: Thu, 15 Oct 2015 13:27:29 -0500 Subject: [PATCH] Ensure git clones discard local modifications If a cloned repo contains local modifications, the clone task will fail. This ensures any local modifications are discarded, ensuring a successful clone. Change-Id: Ic5799fe07e15739cc11acabba803e3be47606f94 Closes-Bug: #1506590 --- playbooks/roles/os_nova/tasks/nova_console_novnc_install.yml | 1 + playbooks/roles/os_nova/tasks/nova_console_spice_install.yml | 1 + playbooks/roles/os_tempest/tasks/tempest_install.yml | 1 + playbooks/roles/py_from_git/tasks/main.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/playbooks/roles/os_nova/tasks/nova_console_novnc_install.yml b/playbooks/roles/os_nova/tasks/nova_console_novnc_install.yml index bdbf55cfe0..904890eeda 100644 --- a/playbooks/roles/os_nova/tasks/nova_console_novnc_install.yml +++ b/playbooks/roles/os_nova/tasks/nova_console_novnc_install.yml @@ -20,6 +20,7 @@ clone: "yes" update: "yes" version: "{{ nova_novncproxy_git_install_branch }}" + force: yes register: git_clone until: git_clone|success retries: 5 diff --git a/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml b/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml index 966130dd5e..5086bf47be 100644 --- a/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml +++ b/playbooks/roles/os_nova/tasks/nova_console_spice_install.yml @@ -45,6 +45,7 @@ clone: "yes" update: "yes" version: "{{ nova_spicehtml5_git_install_branch }}" + force: yes register: git_clone until: git_clone|success retries: 5 diff --git a/playbooks/roles/os_tempest/tasks/tempest_install.yml b/playbooks/roles/os_tempest/tasks/tempest_install.yml index 5fb5a59dd7..377d1863d5 100644 --- a/playbooks/roles/os_tempest/tasks/tempest_install.yml +++ b/playbooks/roles/os_tempest/tasks/tempest_install.yml @@ -33,6 +33,7 @@ repo: "{{ tempest_git_repo }}" dest: "{{ tempest_git_dest }}" version: "{{ tempest_git_install_branch }}" + force: yes register: git_clone until: git_clone|success retries: 5 diff --git a/playbooks/roles/py_from_git/tasks/main.yml b/playbooks/roles/py_from_git/tasks/main.yml index c459071491..20a8f68360 100644 --- a/playbooks/roles/py_from_git/tasks/main.yml +++ b/playbooks/roles/py_from_git/tasks/main.yml @@ -18,6 +18,7 @@ repo: "{{ git_repo }}" dest: "{{ git_dest }}" version: "{{ git_install_branch }}" + force: yes register: git_clone until: git_clone|success retries: 5