From 7c46d951e91b22c09fdaafc610a9141e27d7b59d Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 11 Dec 2017 12:35:57 +0000 Subject: [PATCH] Use correct name for networking-odl git group Currently the networking-odl repo will always be cloned, and the package always built due to the incorrect naming of the project group. The group used thus falls back to the default of 'all', resulting in this behaviour. This patch corrects the name, but also moves the git repo variable details into the openstack_services file along with the other neutron drivers/plugins. The spacing between the variables is also corrected so that all related variables have a single line break between them, but all unrelated items have a double line break between them. Change-Id: I8786405d6174e69bef5d85b8ff473d2d262d068b --- .../defaults/repo_packages/opendaylight.yml | 18 ------------------ .../repo_packages/openstack_services.yml | 10 ++++++++++ 2 files changed, 10 insertions(+), 18 deletions(-) delete mode 100644 playbooks/defaults/repo_packages/opendaylight.yml diff --git a/playbooks/defaults/repo_packages/opendaylight.yml b/playbooks/defaults/repo_packages/opendaylight.yml deleted file mode 100644 index d9b764b136..0000000000 --- a/playbooks/defaults/repo_packages/opendaylight.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Copyright 2017, Ericsson AB -# -# 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. - -networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl -networking_odl_git_install_branch: 7a3c5fee7deb01d9237f5d1cc43a17931999af02 # HEAD of "master" as of 24.11.2017 -networking_odl_project_group: neutron_all diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 865016345d..63a290387c 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -150,6 +150,11 @@ networking_calico_git_repo: https://git.openstack.org/openstack/networking-calic networking_calico_git_install_branch: 9688df1a3d1d8b3fd9ba367e82fe6b0559416728 # HEAD of "master" as of 24.11.2017 networking_calico_git_project_group: neutron_all +networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl +networking_odl_git_install_branch: 7a3c5fee7deb01d9237f5d1cc43a17931999af02 # HEAD of "master" as of 24.11.2017 +networking_odl_git_project_group: neutron_all + + ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova nova_git_install_branch: 22a790ef45b0523e8cf2ed97d14e050431c90fd9 # HEAD of "master" as of 24.11.2017 @@ -191,11 +196,13 @@ ironic_git_repo: https://git.openstack.org/openstack/ironic ironic_git_install_branch: 27ce77142bfb9ac56e85db37e0923a0eb47f2f7a # HEAD of "master" as of 24.11.2017 ironic_git_project_group: ironic_all + ## Magnum service magnum_git_repo: https://git.openstack.org/openstack/magnum magnum_git_install_branch: 4bf3b3263870a4ec81cf372713cacec446b3ee84 # HEAD of "master" as of 24.11.2017 magnum_git_project_group: magnum_all + ## Trove service trove_git_repo: https://git.openstack.org/openstack/trove trove_git_install_branch: b09d0eb3135047891a369d3c0eb2c6e9ae649f5b # HEAD of "master" as of 24.11.2017 @@ -206,16 +213,19 @@ trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard trove_dashboard_git_install_branch: 14a4609606d42cae827b8fc6b44453caea258976 # HEAD of "master" as of 24.11.2017 trove_dashboard_git_project_group: horizon_all + ## Octavia service octavia_git_repo: https://git.openstack.org/openstack/octavia octavia_git_install_branch: bb9bb2d05b268cff9846e0a09ad3940be5fe5a80 # HEAD of "master" as of 24.11.2017 octavia_git_project_group: octavia_all + ## Molteniron service molteniron_git_repo: https://git.openstack.org/openstack/molteniron molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 24.11.2017 molteniron_git_project_group: molteniron_all + ## Tacker service tacker_git_repo: https://git.openstack.org/openstack/tacker tacker_git_install_branch: cc03b5d952527b8cad2e2e309a97d55afb1ca559 # HEAD of "master" as of 24.11.2017