c4f45f5f08
This patch does the following: - updates the Master SHAs for new development work. - includes updates to policy, paste and rootwrap files as required - moves the Aodh repository to openstack_services as it now has implemented a stable branch - Updated the keystone-wsgi file as it was still running the code from liberty - add 2 package requirements to keystone which must be present for the new wsgi file. - updates tempest.conf.j2 to replace ssh_auth_method with auth_method, and change auth_method to 'keypair' (configured is no longer an a valid option) Change-Id: I933c24c03518865d9d40519dafb2ba46769a5453 Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
44 lines
1.9 KiB
YAML
44 lines
1.9 KiB
YAML
---
|
|
# 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.
|
|
|
|
|
|
## Tempest service
|
|
tempest_git_repo: https://git.openstack.org/openstack/tempest
|
|
tempest_git_install_branch: 5cc7ef78b4233444a4dcea1b1eb8f213c1548491 # HEAD of "master" as of 17.01.2016
|
|
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
|
|
|
|
|
|
## NOVNC from source
|
|
novncproxy_git_repo: https://github.com/kanaka/novnc
|
|
novncproxy_git_install_branch: 670dbddb54264fd0082d0aca1b3acb0f1814b1d2 # HEAD of "master" as of 17.01.2016
|
|
novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
|
|
|
|
|
|
## spice-html5 from source
|
|
spicehtml5_git_repo: https://github.com/SPICE/spice-html5
|
|
spicehtml5_git_install_branch: ab73d009487c8afd4def39b54a422499b4c13c40 # HEAD of "master" as of 17.01.2016
|
|
spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
|