From b158b904c94b430d01a11a259d81a2de412a2dc3 Mon Sep 17 00:00:00 2001 From: Logan V Date: Thu, 29 Jun 2017 14:33:40 -0500 Subject: [PATCH] Update Calico repo build information 1) Remove calico-felix git information as it is no longer a python based agent that will be stored in the repo. Instead, we now download the Go based agent binary from Calico's github from within the Neutron role. 2) Bump networking-calico to the current HEAD of master. Change-Id: Id7b035eb1385da67247adf4fa2b7c3dba5822f3c --- .../repo_packages/openstack_services.yml | 3 +++ .../defaults/repo_packages/projectcalico.yml | 22 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 playbooks/defaults/repo_packages/projectcalico.yml diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 0e02073389..0213c204ed 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -141,6 +141,9 @@ neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dy neutron_dynamic_routing_git_install_branch: e757b7bd7f14537ceedacbc9cfcac5d76c65030e # HEAD of "master" as of 02.06.2017 neutron_dynamic_routing_git_project_group: neutron_all +networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico +networking_calico_git_install_branch: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 29.06.2017 +networking_calico_git_project_group: neutron_all ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova diff --git a/playbooks/defaults/repo_packages/projectcalico.yml b/playbooks/defaults/repo_packages/projectcalico.yml deleted file mode 100644 index 802c815195..0000000000 --- a/playbooks/defaults/repo_packages/projectcalico.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Copyright 2016, Logan Vig -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -calico_git_repo: https://github.com/projectcalico/felix -calico_git_install_branch: c785fdd98a10559270a2e68c040ae84c8b18bee6 # Tag 1.4.4 -calico_git_project_group: neutron_all - -networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico -networking_calico_git_install_branch: 2afdf3e427555cbdf0dd0c583f1d70d92bf39748 # HEAD of "master" as of 12.10.2016 -networking_calico_git_project_group: neutron_all