From a1e465e270a470e9ca9dfd74cd389b563137ebe4 Mon Sep 17 00:00:00 2001 From: Daniel Gonzalez Date: Fri, 7 Oct 2016 15:15:28 +0200 Subject: [PATCH] Change calico_git_repo to new repository https://github.com/projectcalico/calico/ has moved to https://github.com/projectcalico/felix/. This change updates the calico_git_repo variable accordingly. The role SHA for os_neutron is updated as the updated SHA includes the same fix. Without it the repo build process tries to access both repositories. Change-Id: I723174204005f75f481733908ebcef74ce5074d6 Closes-Bug: #1631362 --- ansible-role-requirements.yml | 2 +- playbooks/defaults/repo_packages/projectcalico.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index aefc10cacc..dcf7af3c93 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -97,7 +97,7 @@ - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron - version: 5764e6c8cb30e32a7f5f2f95063bbd4ca3a4537f + version: d2adbdded42ed7dd41e61935ef193972c534591a - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova diff --git a/playbooks/defaults/repo_packages/projectcalico.yml b/playbooks/defaults/repo_packages/projectcalico.yml index 81ba89f60b..c4264acb33 100644 --- a/playbooks/defaults/repo_packages/projectcalico.yml +++ b/playbooks/defaults/repo_packages/projectcalico.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -calico_git_repo: https://github.com/projectcalico/calico +calico_git_repo: https://github.com/projectcalico/felix calico_git_install_branch: 1.4.0 # current tag as of 22.07.2016 calico_git_project_group: neutron_all