From 52636ce00bcf9e36dc218786fa23245629fb51d0 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Thu, 3 Sep 2015 10:24:57 +0100
Subject: [PATCH] Set client versions deployed to use global requirements
This patch removes all SHA specifications for the OpenStack clients
so that any client requirement versions are determined solely from
the requirements of the OpenStack service and Global requirements
files.
This resolves issues where the client versions we carry are
incompatible with the services, resulting in unexpected failures.
The Tempest SHA configuration is moved into openstack_other so that
it can be addressed seperately when updating the SHA's. This will
be useful when master is branched to become liberty and all the
OpenStack services start to track an upstream stable/liberty branch.
The Global Requirements SHA configuration is shifted to
openstack_services for a similar reason. It will track an upstream
stable/liberty branch with all the openstack services.
Change-Id: I8f90389d22d2581814c4c62cfd37d0a4405bfd30
---
.../repo_packages/openstack_clients.yml | 78 -------------------
.../repo_packages/openstack_other.yml | 14 +---
.../repo_packages/openstack_services.yml | 13 ++--
playbooks/os-tempest-install.yml | 2 +-
4 files changed, 12 insertions(+), 95 deletions(-)
delete mode 100644 playbooks/defaults/repo_packages/openstack_clients.yml
diff --git a/playbooks/defaults/repo_packages/openstack_clients.yml b/playbooks/defaults/repo_packages/openstack_clients.yml
deleted file mode 100644
index 4e14207fa5..0000000000
--- a/playbooks/defaults/repo_packages/openstack_clients.yml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-# Copyright 2014, Rackspace US, Inc.
-#
-# 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.
-
-
-## NOTICE on items in this file:
-## * If you use anything in the *._git_install_branch field that is not a TAG
-## make sure to leave an in-line comment as to "why".
-
-## For the sake of anyone else editing this file:
-## * If you add clients to this file please do so in alphabetical order.
-## * Every entry should be name spaced with the name of the client followed by an "_"
-## * All items with this file should be separated by `name_` note that the name of the
-## package should be one long name with no additional `_` separating it.
-
-## Ceilometer client
-ceilometerclient_git_repo: https://git.openstack.org/openstack/python-ceilometerclient
-ceilometerclient_git_install_branch: 1fc68877ff8c6f31867a39dbb647688db6b069c3 # HEAD of "master" as of 15.08.2015
-ceilometerclient_git_dest: "/opt/ceilometerclient_{{ ceilometerclient_git_install_branch | replace('/', '_') }}"
-
-
-## Cinder client
-cinderclient_git_repo: https://git.openstack.org/openstack/python-cinderclient
-cinderclient_git_install_branch: c26930f811ace7630c566470fea7fd66ba6b722f # HEAD of "master" as of 15.08.2015
-cinderclient_git_dest: "/opt/cinderclient_{{ cinderclient_git_install_branch | replace('/', '_') }}"
-
-
-## Glance client
-glanceclient_git_repo: https://git.openstack.org/openstack/python-glanceclient
-glanceclient_git_install_branch: 8d118ccedc7e0544ec21e1fbb7f1b8b3a4f03715 # HEAD of "master" as of 15.08.2015
-glanceclient_git_dest: "/opt/glanceclient_{{ glanceclient_git_install_branch | replace('/', '_') }}"
-
-
-## Heat client
-heatclient_git_repo: https://git.openstack.org/openstack/python-heatclient
-heatclient_git_install_branch: 1751fdeef10a51c617c6000be51e291361b5eafe # HEAD of "master" as of 15.08.2015
-heatclient_git_dest: "/opt/heatclient_{{ heatclient_git_install_branch | replace('/', '_') }}"
-
-
-# Keystone client
-keystoneclient_git_repo: https://git.openstack.org/openstack/python-keystoneclient
-keystoneclient_git_install_branch: cba0a6805d424a9f151ab91de1fe19fbd35c2ac9 # HEAD of "master" as of 15.08.2015
-keystoneclient_git_dest: "/opt/keystoneclient_{{ keystoneclient_git_install_branch | replace('/', '_') }}"
-
-
-## Neutron client
-neutronclient_git_repo: https://git.openstack.org/openstack/python-neutronclient
-neutronclient_git_install_branch: 16e02dd83adabd58029e57a95f8ce844d972a469 # HEAD of "master" as of 15.08.2015
-neutronclient_git_dest: "/opt/neutronclient_{{ neutronclient_git_install_branch | replace('/', '_') }}"
-
-
-## Nova client
-novaclient_git_repo: https://git.openstack.org/openstack/python-novaclient
-novaclient_git_install_branch: 1552d3e4d329c2e9bb695db3d48bb7a7b4f91ec4 # HEAD of "master" as of 15.08.2015
-novaclient_git_dest: "/opt/novaclient_{{ novaclient_git_install_branch | replace('/', '_') }}"
-
-
-## OpenStack client
-openstackclient_git_repo: https://git.openstack.org/openstack/python-openstackclient
-openstackclient_git_install_branch: ac5e289476911d8db13fce8411a062814a069d4b # HEAD of "master" as of 15.08.2015
-openstackclient_git_dest: "/opt/openstackclient_{{ openstackclient_git_install_branch | replace('/', '_') }}"
-
-
-## Swift client
-swiftclient_git_repo: https://git.openstack.org/openstack/python-swiftclient
-swiftclient_git_install_branch: 3c6565235464fa724929b5abe8f2c32c001996bf # HEAD of "master" as of 15.08.2015
-swiftclient_git_dest: "/opt/swiftclient_{{ swiftclient_git_install_branch | replace('/', '_') }}"
diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml
index f723c3be4c..9ead919e10 100644
--- a/playbooks/defaults/repo_packages/openstack_other.yml
+++ b/playbooks/defaults/repo_packages/openstack_other.yml
@@ -25,13 +25,7 @@
## package should be one long name with no additional `_` separating it.
-## Glance store library
-glancestore_git_repo: https://git.openstack.org/openstack/glance_store
-glancestore_git_install_branch: 425360035676d4bb88b8b5eea3d7ccabb65e850a # HEAD of "master" as of 15.08.2015
-glancestore_git_dest: "/opt/glancestore_{{ glancestore_git_repo | replace('/', '_') }}"
-
-
-## Global Requirements
-requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: 2a6b64eeee05933f3719ab50e8b6d2b8e0b13e99 # HEAD of "master" as of 15.08.2015
-requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
+## Tempest service
+tempest_git_repo: https://git.openstack.org/openstack/tempest
+tempest_git_install_branch: eb87b44c5af64784a3c5e343f6867b717f670dbd # HEAD of "master" as of 15.08.2015
+tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
index 0fd891b437..049090f262 100644
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@@ -28,6 +28,13 @@
### Before this is shipped all of these services should have a tag set as the branch,
### or have a comment / reason attached to them as to why a tag can not work.
+
+## Global Requirements
+requirements_git_repo: https://git.openstack.org/openstack/requirements
+requirements_git_install_branch: 2a6b64eeee05933f3719ab50e8b6d2b8e0b13e99 # HEAD of "master" as of 15.08.2015
+requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
+
+
## Ceilometer service
ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
ceilometer_git_install_branch: 3c10d3876eac0b27e39c7d93e7d772a5614518ee # HEAD of "master" as of 15.08.2015
@@ -92,9 +99,3 @@ nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
swift_git_repo: https://git.openstack.org/openstack/swift
swift_git_install_branch: a2c0e6f68728f7837266f489098adf2cff78a500 # HEAD of "master" as of 15.08.2015
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
-
-
-## Tempest service
-tempest_git_repo: https://git.openstack.org/openstack/tempest
-tempest_git_install_branch: eb87b44c5af64784a3c5e343f6867b717f670dbd # HEAD of "master" as of 15.08.2015
-tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml
index b311f6df8c..69720689f5 100644
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@@ -29,7 +29,7 @@
tags:
- "system-crontab-coordination"
vars_files:
- - defaults/repo_packages/openstack_services.yml
+ - defaults/repo_packages/openstack_other.yml
vars:
# This sets the tempest group to the utility group
tempest_main_group: utility_all