openstack
/
openstack-ansible
Code Issues Proposed changes

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
This commit is contained in:
Daniel Gonzalez 2016-10-07 15:15:28 +02:00 committed by Jesse Pretorius
parent eaafebaa20
commit a1e465e270
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible-role-requirements.yml
View File

@ -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

2
playbooks/defaults/repo_packages/projectcalico.yml
View File

@ -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