openstack
/
openstack-ansible
Code Issues Proposed changes

Updated master to the latest SHAs - 22.06.2015 

Updates all of master to track the latest releases and changes coming in
the Liberty cycle.

Change-Id: I1b15869e43bd082aa60f04707f389968eeb80d24
This commit is contained in:
kevin 2015-06-20 19:53:40 -05:00 committed by Kevin Carter
parent c068b965a1
commit 36a505bb68
6 changed files with 83 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -48,3 +48,8 @@ docs/build/
Icon?
ehthumbs.db
Thumbs.db
# User driven backup files #
############################
*.bak

32
playbooks/defaults/repo_packages/openstack_clients.yml
View File

@ -26,95 +26,95 @@
## Barbican client
barbicanclient_git_repo: https://github.com/openstack/python-barbicanclient
barbicanclient_git_install_branch: e3431cd818de996f57528bb2f6127d192a886ec4 # HEAD of "master" as of 08.06.2015
barbicanclient_git_install_branch: 2f9dc5eb0d5124df41620c6f34202219687f5583 # HEAD of "master" as of 22.06.2015
barbicanclient_git_dest: "/opt/barbicanclient_{{ barbicanclient_git_install_branch | replace('/', '_') }}"
## Ceilometer client
ceilometerclient_git_repo: https://github.com/openstack/python-ceilometerclient
ceilometerclient_git_install_branch: 662a4642046ff86fefb56e89bfe269ff6b8bf100 # HEAD of "master" as of 08.06.2015
ceilometerclient_git_install_branch: 7e4d2edc970a555b982d7081a95c6a1ada6d58de # HEAD of "master" as of 22.06.2015
ceilometerclient_git_dest: "/opt/ceilometerclient_{{ ceilometerclient_git_install_branch | replace('/', '_') }}"
## Cinder client
cinderclient_git_repo: https://github.com/openstack/python-cinderclient
cinderclient_git_install_branch: 91bf760989a6c992918d6eadb038d7265ea18287 # HEAD of "master" as of 08.06.2015
cinderclient_git_install_branch: f32684747f39d6723f990ee3171e507466066e36 # HEAD of "master" as of 22.06.2015
cinderclient_git_dest: "/opt/cinderclient_{{ cinderclient_git_install_branch | replace('/', '_') }}"
## Designate client
designateclient_git_repo: https://github.com/openstack/python-designateclient
designateclient_git_install_branch: 1548cb1af60f25c4a535251caa01089c80a0b416 # HEAD of "master" as of 08.06.2015
designateclient_git_install_branch: b57328dc8f7346152464e18b0210dd1d44abc6f3 # HEAD of "master" as of 22.06.2015
designateclient_git_dest: "/opt/designateclient_{{ designateclient_git_install_branch | replace('/', '_') }}"
## Glance client
glanceclient_git_repo: https://github.com/openstack/python-glanceclient
glanceclient_git_install_branch: dfa98ab04c7fb7260b25e92af18caa2a016698c6 # HEAD of "master" as of 08.06.2015
glanceclient_git_install_branch: cc38f51086b930a05c0abecf6c9e00fdf5c294f6 # HEAD of "master" as of 22.06.2015
glanceclient_git_dest: "/opt/glanceclient_{{ glanceclient_git_install_branch | replace('/', '_') }}"
## Heat client
heatclient_git_repo: https://github.com/openstack/python-heatclient
heatclient_git_install_branch: 296c8c2a73b936ce1cfc205f447ecc6a8183ebd3 # HEAD of "master" as of 08.06.2015
heatclient_git_install_branch: 4b193e11712847e9b5a80a507124f5d22749ae8d # HEAD of "master" as of 22.06.2015
heatclient_git_dest: "/opt/heatclient_{{ heatclient_git_install_branch | replace('/', '_') }}"
# Ironic client
ironicclient_git_repo: https://github.com/openstack/python-ironicclient
ironicclient_git_install_branch: 01d2520788a1effb66fa6009fc8c8b4e38aace28 # HEAD of "master" as of 08.06.2015
ironicclient_git_install_branch: 3f4671a0b7eb5c300291c2e92082d16b96e6316c # HEAD of "master" as of 22.06.2015
ironicclient_git_dest: "/opt/ironicclient_{{ ironicclient_git_install_branch | replace('/', '_') }}"
# Keystone client
keystoneclient_git_repo: https://github.com/openstack/python-keystoneclient
keystoneclient_git_install_branch: 7f407488cefd9668b31df6b4050209438675a95f # HEAD of "master" as of 08.06.2015
keystoneclient_git_install_branch: d238cc9af4927d1092de207db978536d712af129 # HEAD of "master" as of 22.06.2015
keystoneclient_git_dest: "/opt/keystoneclient_{{ keystoneclient_git_install_branch | replace('/', '_') }}"
## Neutron client
neutronclient_git_repo: https://github.com/openstack/python-neutronclient
neutronclient_git_install_branch: 7eb3241650ad87d2f6ca5aa45b3a2415eafe7207 # HEAD of "master" as of 08.06.2015
neutronclient_git_install_branch: dcb7401a04c96aeb7c00a456b1ba0c77134a0a25 # HEAD of "master" as of 22.06.2015
neutronclient_git_dest: "/opt/neutronclient_{{ neutronclient_git_install_branch | replace('/', '_') }}"
## Nova client
novaclient_git_repo: https://github.com/openstack/python-novaclient
novaclient_git_install_branch: 773eea811df7be3dcb73dc2ae16354b172f442c6 # HEAD of "master" as of 08.06.2015
novaclient_git_install_branch: 3c2ff0faad8c84777ffe7d9946a1bc4486116084 # HEAD of "master" as of 22.06.2015
novaclient_git_dest: "/opt/novaclient_{{ novaclient_git_install_branch | replace('/', '_') }}"
## OpenStack client
openstackclient_git_repo: https://github.com/openstack/python-openstackclient
openstackclient_git_install_branch: 7cf779004e5e9eab9abee8d8a5bc2db3dfa8bd5d # HEAD of "master" as of 08.06.2015
openstackclient_git_install_branch: 2d6bc8f4c38dbf997e3e71119f13f0328b4a8669 # HEAD of "master" as of 22.06.2015
openstackclient_git_dest: "/opt/openstackclient_{{ openstackclient_git_install_branch | replace('/', '_') }}"
## Sahara client
saharaclient_git_repo: https://github.com/openstack/python-saharaclient
saharaclient_git_install_branch: 963d8ce6bbdfa151defe6702c8d0c31300607c03 # HEAD of "master" as of 08.06.2015
saharaclient_git_install_branch: 7eeac47d6cb7f2a734894004f62f6b6b91264597 # HEAD of "master" as of 22.06.2015
saharaclient_git_dest: "/opt/saharaclient_{{ saharaclient_git_install_branch | replace('/', '_') }}"
## Swift client
swiftclient_git_repo: https://github.com/openstack/python-swiftclient
swiftclient_git_install_branch: ec3e2ab3a099b1276ae5d87fda936567f64423dc # HEAD of "master" as of 08.06.2015
swiftclient_git_install_branch: 7c716997a8ede3f98741709b0594340df9849a76 # HEAD of "master" as of 22.06.2015
swiftclient_git_dest: "/opt/swiftclient_{{ swiftclient_git_install_branch | replace('/', '_') }}"
## Trove client
troveclient_git_repo: https://github.com/openstack/python-troveclient
troveclient_git_install_branch: e586689e0890da00f29a474b35a8e3537654b72e # HEAD of "master" as of 08.06.2015
troveclient_git_install_branch: cdbf0f3071785dbe8f83b658748327f8b04a6c12 # HEAD of "master" as of 22.06.2015
troveclient_git_dest: "/opt/troveclient_{{ troveclient_git_install_branch | replace('/', '_') }}"
## Tuskar client
tuskarclient_git_repo: https://github.com/openstack/python-tuskarclient
tuskarclient_git_install_branch: 47fdee09d06d80b523ab6e68fb7ebb93074b4659 # HEAD of "master" as of 08.06.2015
tuskarclient_git_install_branch: 6fa19d5d106a353188cbccd286a710d1ada4d1d8 # HEAD of "master" as of 22.06.2015
tuskarclient_git_dest: "/opt/tuskarclient_{{ tuskarclient_git_install_branch | replace('/', '_') }}"
## Zaqar client
zaqarclient_git_repo: https://github.com/openstack/python-zaqarclient
zaqarclient_git_install_branch: 09de9ee38127c4cea67553881fa71991df4d9e37 # HEAD of "master" as of 08.06.2015
zaqarclient_git_install_branch: 09de9ee38127c4cea67553881fa71991df4d9e37 # HEAD of "master" as of 22.06.2015
zaqarclient_git_dest: "/opt/zaqarclient_{{ zaqarclient_git_install_branch | replace('/', '_') }}"

8
playbooks/defaults/repo_packages/openstack_other.yml
View File

@ -26,19 +26,19 @@
## Glance store library
glancestore_git_repo: https://github.com/openstack/glance_store
glancestore_git_install_branch: 5277c93e002047d55c521408ee31da1d03825263 # HEAD of "master" as of 08.06.2015
glancestore_git_install_branch: 0ae8f4102e7aeebb75fe5f65c02ed9bfa76cebb5 # HEAD of "master" as of 22.06.2015
glancestore_git_dest: "/opt/glancestore_{{ glancestore_git_repo | replace('/', '_') }}"
## Global Requirements
requirements_git_repo: https://github.com/openstack/requirements
requirements_git_install_branch: fceaa485414e8872a79b4b3628bc94bcd10e1839 # HEAD of "master" as of 08.06.2015
requirements_git_install_branch: 6100411c312cfa63526f5dada31318d7f2a605ad # HEAD of "master" as of 22.06.2015
requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
## Tempest Library
tempestlib_git_repo: https://github.com/openstack/tempest-lib
tempestlib_git_install_branch: f93048334cf9f93a823dd42387f76ecddf27d30d # HEAD of "master" as of 08.06.2015
tempestlib_git_install_branch: 061a2efc71ccce9024f86517edccdb4c82d416bc # HEAD of "master" as of 22.06.2015
tempestlib_git_dest: "/opt/tempest-lib_{{ requirements_git_install_branch | replace('/', '_') }}"
## Cryptography
@ -46,5 +46,5 @@ tempestlib_git_dest: "/opt/tempest-lib_{{ requirements_git_install_branch | repl
# global-requirements.txt allows for it. See also:
# https://github.com/pyca/cryptography/issues/1868
cryptography_git_repo: https://github.com/pyca/cryptography
cryptography_git_install_branch: 926f8ac4927bdc9977f2d960c7def3f2927d1198 # HEAD of "master" as of 16.06.2015
cryptography_git_install_branch: 02a299d8b2d70e4e145fbd420787ea35873d96f7 # HEAD of "master" as of 22.06.2015
cryptography_git_dest: "/opt/cryptography_{{ cryptography_git_install_branch | replace('/', '_') }}"

24
playbooks/defaults/repo_packages/openstack_services.yml
View File

@ -30,66 +30,66 @@
## Cinder service
cinder_git_repo: https://github.com/openstack/cinder
cinder_git_install_branch: fce961e8c8081b804f25786935e4026a87abf9dd # HEAD of "master" as of 08.06.2015
cinder_git_install_branch: 648d544621ed101e6f5581a201efea585a08935a # HEAD of "master" as of 22.06.2015
cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
## Glance service
glance_git_repo: https://github.com/openstack/glance
glance_git_install_branch: be8c464c8e986fc6ca064b42d475c805aac9062d # HEAD of "master" as of 08.06.2015
glance_git_install_branch: 33fb88108b90e7841e5ac12054214ab229dacd2d # HEAD of "master" as of 22.06.2015
glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
## Heat service
heat_git_repo: https://github.com/openstack/heat
heat_git_install_branch: 8fe06151c1691d2246dcec3e6dcae7c204908df2 # HEAD of "master" as of 08.06.2015
heat_git_install_branch: c512e0fb878ecd519fac19df5d35fb8d83590c92 # HEAD of "master" as of 22.06.2015
heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}"
## Horizon service
horizon_git_repo: https://github.com/openstack/horizon
horizon_git_install_branch: b11d49891c6c8e8cdbc3a09f538d13596fe10b8e # HEAD of "master" as of 08.06.2015
horizon_git_install_branch: 6b18a22b51aa991ed1bf45871b98e5a20362778b # HEAD of "master" as of 22.06.2015
horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
## Keystone service
keystone_git_repo: https://github.com/openstack/keystone
keystone_git_install_branch: 7f76f23bccd772df35da63584685584576289255 # HEAD of "master" as of 08.06.2015
keystone_git_install_branch: a7ca13b687dd284f0980d768b11a3d1b52b4106e # HEAD of "master" as of 22.06.2015
keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}"
## Neutron service
neutron_git_repo: https://github.com/openstack/neutron
neutron_git_install_branch: 692da2b7c70dd57c692a36f7a6d8f55fc1fa2a44 # HEAD of "master" as of 08.06.2015
neutron_git_install_branch: 3c6ab9e360e6f29b844e53304d0300714b1d52f9 # HEAD of "master" as of 22.06.2015
neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}"
neutron_lbaas_git_repo: https://github.com/openstack/neutron-lbaas
neutron_lbaas_git_install_branch: 397585792ce363a4d894136186a7aa51f39c726b # HEAD of "master" as of 08.06.2015
neutron_lbaas_git_install_branch: d7bbbf4ce85e923e167ab06004f8cf51055f87ba # HEAD of "master" as of 22.06.2015
neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
neutron_vpnaas_git_repo: https://github.com/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: 17b7f1989a3864cd1d742d58ad9696c21f90563a # HEAD of "master" as of 08.06.2015
neutron_vpnaas_git_install_branch: f8b7d3168b03efd0fe4fd81f22a98763bae60890 # HEAD of "master" as of 22.06.2015
neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
neutron_fwaas_git_repo: https://github.com/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: 76c2a4e4124b62fec9236927f9122e1f696cc9ce # HEAD of "master" as of 08.06.2015
neutron_fwaas_git_install_branch: b1853c01264cef9893cc86192f198f6ab62f4ecd # HEAD of "master" as of 22.06.2015
neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
## Nova service
nova_git_repo: https://github.com/openstack/nova
nova_git_install_branch: 770a897179f09546b32763697319d49be1697be1 # HEAD of "master" as of 08.06.2015
nova_git_install_branch: a4f4be370be06cfc9aa3ed30d2445277e832376f # HEAD of "master" as of 22.06.2015
nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
## Swift service
swift_git_repo: https://github.com/openstack/swift
swift_git_install_branch: 0cf95b055549fd76aba38ea682ad4cc0a74de7fa # HEAD of "master" as of 08.06.2015
swift_git_install_branch: 0009a43eb45fdee6716d1272b346cfc76d946e4b # HEAD of "master" as of 22.06.2015
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
## Tempest service
tempest_git_repo: https://github.com/openstack/tempest
tempest_git_install_branch: 9927d643c7340cc55a351cc8ed159d7dd3ba0c54 # HEAD of "master" as of 08.06.2015
tempest_git_install_branch: 1cfa1720e8db3966af7ad042b6fbb12e01e2ab31 # HEAD of "master" as of 22.06.2015
tempest_git_install_fragments: "yaprtignorerequirements=true"
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"

2
scripts/sources-branch-updater.sh
View File

@ -65,7 +65,7 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE});do
# Set the branch entry
branch_entry="${branch_sha} # HEAD of \"$ONLINE_BRANCH\" as of $(date +%d.%m.%Y)"
# Write the branch entry
sed -i "s|${repo_name}_git_install_branch:.*|${repo_name}_git_install_branch: $branch_entry|" ${SERVICE_FILE}
sed -i.bak "s|${repo_name}_git_install_branch:.*|${repo_name}_git_install_branch: $branch_entry|" ${SERVICE_FILE}
echo "processed $repo_name @ $branch_entry"
fi
done

45
scripts/update-revision.sh Normal file
View File

@ -0,0 +1,45 @@
#!/usr/bin/env bash
# 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.
# What this script is for:
# This script updates the various "openstack_release" variables The
# purpose of this script is to eliminate error when updating the released
# versions.
if echo "$@" | grep -e '-h' -e '--help' || [ -z "${2}" ];then
echo "
Options:
-r|--revision (name/id of revision)
"
exit 0
fi
# Provide some CLI options
while [[ $# > 1 ]]
do
key="$1"
case $key in
-r|--revision)
REVISION="$2"
shift
;;
*)
;;
esac
shift
done
sed -i.bak "s/^openstack_release\:.*/openstack_release\: ${REVISION}/" playbooks/inventory/group_vars/all.yml