Update all SHAs for Newton 2016-09-16

This patch updates all the roles to the latest available SHA's,
updates all the OpenStack Service SHA's and also updates the
appropriate python requirements pins.

Change-Id: Ia9cb9dd47b391ebcbcc26d320245e3a7e4751568
This commit is contained in:
Jesse Pretorius
2016-09-16 07:30:41 +01:00
committed by Jesse Pretorius (odyssey4me)
parent 40ea97eef0
commit bc8b321fe2
26 changed files with 317 additions and 97 deletions

View File

@@ -1,160 +1,160 @@
- name: apt_package_pinning - name: apt_package_pinning
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
version: master version: 1c01428d33a3a3f3c9cd59cb3f97d89a9af70900
- name: pip_install - name: pip_install
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install
version: master version: 4ca560ae7865d08ad90958771d7f69753c5843c7
- name: galera_client - name: galera_client
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client
version: master version: acc80d216905d20f19238af496c96d4e9f6fe667
- name: galera_server - name: galera_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server
version: master version: 21aaa7cc4fae3867bef27094e6a997ca40f54da6
- name: ceph_client - name: ceph_client
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-ceph_client src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
version: master version: aa47f369ab9cf4a77d49f25b6703fe213d371d54
- name: haproxy_server - name: haproxy_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
version: master version: 9714f8e5f33221016329329a0cd8d4cfd64842dd
- name: keepalived - name: keepalived
scm: git scm: git
src: https://github.com/evrardjp/ansible-keepalived src: https://github.com/evrardjp/ansible-keepalived
version: master version: 2.1.0
- name: lxc_container_create - name: lxc_container_create
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
version: master version: b35928cf83360a2ac8439dd2e43fb7bb0cc366c2
- name: lxc_hosts - name: lxc_hosts
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
version: master version: cf65c6736bccae88511b11a3ae85bcc82cd3b322
- name: memcached_server - name: memcached_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
version: master version: 04941492c38eb80826422980b16d5cabebd5cd3f
- name: openstack-ansible-security - name: openstack-ansible-security
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-security src: https://git.openstack.org/openstack/openstack-ansible-security
version: master version: 4cdf533565817f42fcd2c52eb20ee467e884436b
- name: openstack_hosts - name: openstack_hosts
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
version: master version: 4ec13b9c97d7696cefd1cba2996538c95bbd64ff
- name: os_keystone - name: os_keystone
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
version: master version: 1bfcd10bc58686b07e162d445ea7271d63072313
- name: openstack_openrc - name: openstack_openrc
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
version: master version: 62e3065441f3d714fd9b481288f716b60482d22e
- name: os_aodh - name: os_aodh
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_aodh src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
version: master version: 33b71bad0bae2b178b54af2252b6547b895a0326
- name: os_ceilometer - name: os_ceilometer
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
version: master version: a86683982d8973d2788a5088f97cd7b531e8a786
- name: os_cinder - name: os_cinder
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_cinder src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
version: master version: 5653c1122be16ea1e2d8dd7f39229f13aad7b2ef
- name: os_glance - name: os_glance
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_glance src: https://git.openstack.org/openstack/openstack-ansible-os_glance
version: master version: 482a97671c1e2594188331b95024b603623346a6
- name: os_gnocchi - name: os_gnocchi
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
version: master version: 6de1e4b69958610bb226a35f46cc446c1ae3a61e
- name: os_heat - name: os_heat
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_heat src: https://git.openstack.org/openstack/openstack-ansible-os_heat
version: master version: 3668e42adf8b909fc0bcee0422a9a642c9b55c24
- name: os_horizon - name: os_horizon
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_horizon src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
version: master version: f3274370baf4b2f0e69e2f58603bf8daface709d
- name: os_ironic - name: os_ironic
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ironic src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
version: master version: 8cf25017e49da321cb2274b516df64e2a120c370
- name: os_magnum - name: os_magnum
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_magnum src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
version: master version: 703704b30908b1211368d1678aa693fca204b361
- name: os_neutron - name: os_neutron
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_neutron src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
version: master version: 687c89a5ab9c971d5da70facb34608f322a0d6f0
- name: os_nova - name: os_nova
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_nova src: https://git.openstack.org/openstack/openstack-ansible-os_nova
version: master version: 9e998b52ee0e66d1510a40691390e9a896631921
- name: os_rally - name: os_rally
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_rally src: https://git.openstack.org/openstack/openstack-ansible-os_rally
version: master version: 95356e8ac076dad6b4e75e6b506952140b25de47
- name: os_sahara - name: os_sahara
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_sahara src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
version: master version: db45ff4977dc8e26d69179ed699513fea3a4a3ba
- name: os_swift - name: os_swift
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_swift src: https://git.openstack.org/openstack/openstack-ansible-os_swift
version: master version: 620edb7a2dd5a4ac4e9e672a0798324b302a814d
- name: os_tempest - name: os_tempest
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
version: master version: 505aecf33c5b600e5ec078c76116c419f5af6e7a
- name: plugins - name: plugins
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-plugins src: https://git.openstack.org/openstack/openstack-ansible-plugins
version: master version: 7af6721b4520ee96209e482bd66247afcfa7b4e5
- name: rabbitmq_server - name: rabbitmq_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
version: master version: 716494ee8660737925cc625cee9e74d633b4d942
- name: repo_build - name: repo_build
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_build src: https://git.openstack.org/openstack/openstack-ansible-repo_build
version: master version: 58ebe254dee0f9c69270d67a048b453cec36c932
- name: repo_server - name: repo_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_server src: https://git.openstack.org/openstack/openstack-ansible-repo_server
version: master version: 182da652ea347d2740456672f2e31738dfe9b3d3
- name: rsyslog_client - name: rsyslog_client
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
version: master version: 03049027af8e52f9808a81c4e741997fedeeeaa4
- name: rsyslog_server - name: rsyslog_server
scm: git scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
version: master version: 53bbb2f44dd3c7ce974fe050b4e68555fd8ced84
- name: sshd - name: sshd
scm: git scm: git
src: https://github.com/willshersystems/ansible-sshd src: https://github.com/willshersystems/ansible-sshd
version: master version: 0.4.5
- name: bird - name: bird
scm: git scm: git
src: https://github.com/logan2211/ansible-bird src: https://github.com/logan2211/ansible-bird
version: master version: f041285321e3fb65fc652a9d82d43d2a5ccb8937
- name: etcd - name: etcd
scm: git scm: git
src: https://github.com/logan2211/ansible-etcd src: https://github.com/logan2211/ansible-etcd
version: master version: '1.0'
- name: unbound - name: unbound
scm: git scm: git
src: https://github.com/logan2211/ansible-unbound src: https://github.com/logan2211/ansible-unbound
version: master version: '1.0'
- name: resolvconf - name: resolvconf
scm: git scm: git
src: https://github.com/logan2211/ansible-resolvconf src: https://github.com/logan2211/ansible-resolvconf
version: master version: '1.0'

View File

@@ -5,15 +5,10 @@
# #
# Use this file with caution! # Use this file with caution!
# #
# TODO(odyssey4me) Remove once https://review.openstack.org/368001
# merges and we bump the requirements SHA
oslo.db==4.13.3
### ###
### These are pinned to ensure exactly the same behaviour forever! ### ### These are pinned to ensure exactly the same behaviour forever! ###
### These pins are updated through the sources-branch-updater script ### ### These pins are updated through the sources-branch-updater script ###
### ###
pip==8.1.2 pip==8.1.2
setuptools==27.1.2 setuptools==27.2.0
wheel==0.29.0 wheel==0.29.0

View File

@@ -0,0 +1,38 @@
---
# Copyright 2016, 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 services 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.
### 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.
## Gnocchi service
## This service has a different stable branch strategy to the rest of OpenStack.
## The SHA is recorded here to make the SHA updating easier.
gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
gnocchi_git_install_branch: 85b6854bbc574731a2ffdfa5c10e63a9ae7763e6 # HEAD of "master" as of 16.09.2016
gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
gnocchi_git_project_group: gnocchi_all

View File

@@ -27,19 +27,19 @@
## Tempest service ## Tempest service
tempest_git_repo: https://git.openstack.org/openstack/tempest tempest_git_repo: https://git.openstack.org/openstack/tempest
tempest_git_install_branch: 479bfaccf5b1db53afb9f0663de7544b25c4bca7 # HEAD of "master" as of 12.09.2016 tempest_git_install_branch: 3b0a86f7b8a7a5e8911a2cf7006c469efdbcad06 # HEAD of "master" as of 16.09.2016
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
tempest_git_project_group: utility_all tempest_git_project_group: utility_all
## NOVNC from source ## NOVNC from source
novncproxy_git_repo: https://github.com/kanaka/novnc novncproxy_git_repo: https://github.com/kanaka/novnc
novncproxy_git_install_branch: 7a16304e52b3fbd466337601f05a7def2493c563 # HEAD of "master" as of 12.09.2016 novncproxy_git_install_branch: 7a16304e52b3fbd466337601f05a7def2493c563 # HEAD of "master" as of 16.09.2016
novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}" novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
novncproxy_git_project_group: nova_console novncproxy_git_project_group: nova_console
## spice-html5 from source ## spice-html5 from source
spicehtml5_git_repo: https://github.com/SPICE/spice-html5 spicehtml5_git_repo: https://github.com/SPICE/spice-html5
spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 12.09.2016 spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 16.09.2016
spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}" spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
spicehtml5_git_project_group: nova_console spicehtml5_git_project_group: nova_console

View File

@@ -31,166 +31,159 @@
## Global Requirements ## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements requirements_git_repo: https://git.openstack.org/openstack/requirements
requirements_git_install_branch: 4f211a5002af4b19a2f050e543b34e2212250fbf # HEAD of "master" as of 12.09.2016 requirements_git_install_branch: e2edc35050a99503987cec4120309804f41a830d # HEAD of "master" as of 16.09.2016
requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}"
## Aodh service ## Aodh service
aodh_git_repo: https://git.openstack.org/openstack/aodh aodh_git_repo: https://git.openstack.org/openstack/aodh
aodh_git_install_branch: 3e1ed2ef6619713b71801d95e837451e6893f591 # HEAD of "master" as of 12.09.2016 aodh_git_install_branch: caf9f2e1c252835bda8d2b17b7d1239fcaa9a9ba # HEAD of "stable/newton" as of 16.09.2016
aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}" aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}"
aodh_git_project_group: aodh_all aodh_git_project_group: aodh_all
## Ceilometer service ## Ceilometer service
ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
ceilometer_git_install_branch: f78849c9660b8e73aa2a65b12775804eced2ecdb # HEAD of "master" as of 12.09.2016 ceilometer_git_install_branch: 91d4a9479d4835b1b012ab55eeb678774bf38c76 # HEAD of "master" as of 16.09.2016
ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}" ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}"
ceilometer_git_project_group: ceilometer_all ceilometer_git_project_group: ceilometer_all
## Cinder service ## Cinder service
cinder_git_repo: https://git.openstack.org/openstack/cinder cinder_git_repo: https://git.openstack.org/openstack/cinder
cinder_git_install_branch: 781475f1148d4c730c257a224c8f528ec312c9f7 # HEAD of "master" as of 12.09.2016 cinder_git_install_branch: 0ba267fbc1836722735102994b466ecd7803b10a # HEAD of "stable/newton" as of 16.09.2016
cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}"
cinder_git_project_group: cinder_all cinder_git_project_group: cinder_all
## Glance service ## Glance service
glance_git_repo: https://git.openstack.org/openstack/glance glance_git_repo: https://git.openstack.org/openstack/glance
glance_git_install_branch: 5c198ce45660f879b7c9afaae591e584ee551c3c # HEAD of "master" as of 12.09.2016 glance_git_install_branch: ee667852f588415259bc7b5dbe07b6037da66226 # HEAD of "stable/newton" as of 16.09.2016
glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}"
glance_git_project_group: glance_all glance_git_project_group: glance_all
## Gnocchi service
gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
gnocchi_git_install_branch: a4b12efa21b5ba533e2da5081bd2382169c28414 # HEAD of "master" as of 12.09.2016
gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
gnocchi_git_project_group: gnocchi_all
## Heat service ## Heat service
heat_git_repo: https://git.openstack.org/openstack/heat heat_git_repo: https://git.openstack.org/openstack/heat
heat_git_install_branch: 0f48b1d66c2427be2116d8bc60abc62795b05250 # HEAD of "master" as of 12.09.2016 heat_git_install_branch: 5dc1084260c8a7a7f5ec97d0cdfc1fc08cd8f82e # HEAD of "stable/newton" as of 16.09.2016
heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}"
heat_git_project_group: heat_all heat_git_project_group: heat_all
## Horizon service ## Horizon service
horizon_git_repo: https://git.openstack.org/openstack/horizon horizon_git_repo: https://git.openstack.org/openstack/horizon
horizon_git_install_branch: bff48543ba4709323b287b80c3bba15f043600d5 # HEAD of "master" as of 12.09.2016 horizon_git_install_branch: f9774acb7345b644d344af3af2f350170db38dfd # HEAD of "stable/newton" as of 16.09.2016
horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}"
horizon_git_project_group: horizon_all horizon_git_project_group: horizon_all
## Horizon Ironic dashboard plugin ## Horizon Ironic dashboard plugin
ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
ironic_dashboard_git_install_branch: 7e8189b9ac1c5e818b695f0555994ff15d1465b7 # HEAD of "master" as of 12.09.2016 ironic_dashboard_git_install_branch: 7e8189b9ac1c5e818b695f0555994ff15d1465b7 # HEAD of "master" as of 16.09.2016
ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}" ironic_dashboard_git_dest: "/opt/ironic_dashboard_{{ ironic_dashboard_git_install_branch | replace('/', '_') }}"
ironic_dashboard_git_project_group: horizon_all ironic_dashboard_git_project_group: horizon_all
## Horizon Magnum dashboard plugin ## Horizon Magnum dashboard plugin
magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
magnum_dashboard_git_install_branch: f07baab8e012ccd14492a4ab2c764e1cff3b557f # HEAD of "master" as of 12.09.2016 magnum_dashboard_git_install_branch: 28c55311f09d0b8294fec279bf89fa60582c4c6c # HEAD of "master" as of 16.09.2016
magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}" magnum_dashboard_git_dest: "/opt/magnum_dashboard_{{ magnum_dashboard_git_install_branch | replace('/', '_') }}"
magnum_dashboard_git_project_group: horizon_all magnum_dashboard_git_project_group: horizon_all
## Horizon LBaaS dashboard plugin ## Horizon LBaaS dashboard plugin
neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
neutron_lbaas_dashboard_git_install_branch: aba14a4ccde177141b6314b9fafafb0868b84400 # HEAD of "master" as of 12.09.2016 neutron_lbaas_dashboard_git_install_branch: 2ffb6c930f4c230d0ff888064b6de36aa34cd12f # HEAD of "master" as of 16.09.2016
neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}" neutron_lbaas_dashboard_git_dest: "/opt/neutron_lbaas_dashboard_{{ neutron_lbaas_dashboard_git_install_branch | replace('/', '_') }}"
neutron_lbaas_dashboard_git_project_group: horizon_all neutron_lbaas_dashboard_git_project_group: horizon_all
## Horizon Sahara dashboard plugin ## Horizon Sahara dashboard plugin
sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard
sahara_dashboard_git_install_branch: 2bb9843690e583bc7944a86fdb27058d3cb2e887 # HEAD of "master" as of 12.09.2016 sahara_dashboard_git_install_branch: 8b6b41cf3f648bbba334496b28d7966d7832da74 # HEAD of "stable/newton" as of 16.09.2016
sahara_dashboard_git_dest: "/opt/sahara_dashboard_{{ sahara_dashboard_git_install_branch | replace('/', '_') }}" sahara_dashboard_git_dest: "/opt/sahara_dashboard_{{ sahara_dashboard_git_install_branch | replace('/', '_') }}"
sahara_dashboard_git_project_group: horizon_all sahara_dashboard_git_project_group: horizon_all
## Keystone service ## Keystone service
keystone_git_repo: https://git.openstack.org/openstack/keystone keystone_git_repo: https://git.openstack.org/openstack/keystone
keystone_git_install_branch: bf5711ef029e230fb8d9daae34f0528c8b68a9ae # HEAD of "master" as of 12.09.2016 keystone_git_install_branch: 6eeb354a78084e83d672f5a0e890e8832d87c19f # HEAD of "stable/newton" as of 16.09.2016
keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}"
keystone_git_project_group: keystone_all keystone_git_project_group: keystone_all
## Neutron service ## Neutron service
neutron_git_repo: https://git.openstack.org/openstack/neutron neutron_git_repo: https://git.openstack.org/openstack/neutron
neutron_git_install_branch: daac2701138169d20a41356cb26ff5e28d684c06 # HEAD of "master" as of 12.09.2016 neutron_git_install_branch: b05549f67151883c4a6463540bb57c4513408675 # HEAD of "master" as of 16.09.2016
neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}"
neutron_git_project_group: neutron_all neutron_git_project_group: neutron_all
neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
neutron_lbaas_git_install_branch: 547f668c238b4458ff23576a9bdd2cbe0921370b # HEAD of "master" as of 12.09.2016 neutron_lbaas_git_install_branch: d1693c10ea618f3a15086fa694c792dc65f26a94 # HEAD of "master" as of 16.09.2016
neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}"
neutron_lbaas_git_project_group: neutron_agent neutron_lbaas_git_project_group: neutron_agent
neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
neutron_vpnaas_git_install_branch: 892599a1b4f01ccfc8029769260008970247f4a5 # HEAD of "master" as of 12.09.2016 neutron_vpnaas_git_install_branch: 3c93dc6c136557761fc3bf0a16097180f9f0fe65 # HEAD of "master" as of 16.09.2016
neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}"
neutron_vpnaas_git_project_group: neutron_agent neutron_vpnaas_git_project_group: neutron_agent
neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
neutron_fwaas_git_install_branch: b512cffb4275d24e1b8cefe4144e515bee8044fb # HEAD of "master" as of 12.09.2016 neutron_fwaas_git_install_branch: 71f2220d2c0a6c3c1c375c904b17103ec505769b # HEAD of "master" as of 16.09.2016
neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}"
neutron_fwaas_git_project_group: neutron_agent neutron_fwaas_git_project_group: neutron_agent
neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
neutron_dynamic_routing_git_install_branch: 9872cecbb83b1333ed5e8d48d5cfe44c00488b90 # HEAD of "master" as of 12.09.2016 neutron_dynamic_routing_git_install_branch: 26a252e3d7db2e1fb5dc72058e5b25cd283d00e2 # HEAD of "master" as of 16.09.2016
neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}" neutron_dynamic_routing_git_dest: "/opt/neutron_dynamic_routing_{{ neutron_dynamic_routing_git_install_branch | replace('/', '_') }}"
neutron_dynamic_routing_git_project_group: neutron_agent neutron_dynamic_routing_git_project_group: neutron_agent
## Nova service ## Nova service
nova_git_repo: https://git.openstack.org/openstack/nova nova_git_repo: https://git.openstack.org/openstack/nova
nova_git_install_branch: 110c12b4145a5a978e3dd9e99e65be1d4a86ee06 # HEAD of "master" as of 12.09.2016 nova_git_install_branch: d4b35152c0ac2f3f2b4d158c83dba249d6d2ff0c # HEAD of "stable/newton" as of 16.09.2016
nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}"
nova_git_project_group: nova_all nova_git_project_group: nova_all
## PowerVM Virt Driver ## PowerVM Virt Driver
nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
nova_powervm_git_install_branch: 80e413814424c679215585c7a8e5d33281a1dea0 # HEAD of "master" as of 12.09.2016 nova_powervm_git_install_branch: 89b47fcfc5a8d7f062ef6d845658b4a1b480a487 # HEAD of "master" as of 16.09.2016
nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}" nova_powervm_git_dest: "/opt/nova_powervm_{{ nova_powervm_git_install_branch | replace('/', '_') }}"
nova_powervm_git_project_group: nova_compute nova_powervm_git_project_group: nova_compute
## LXD Virt Driver ## LXD Virt Driver
nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
nova_lxd_git_install_branch: f81277ab66bed71a9c37dc8df99eface79e6156f # HEAD of "master" as of 12.09.2016 nova_lxd_git_install_branch: 3a24f8676e20a4ad96815b2c33ff614361a06dc8 # HEAD of "master" as of 16.09.2016
nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}" nova_lxd_git_dest: "/opt/nova_lxd_{{ nova_lxd_git_install_branch | replace('/', '_') }}"
nova_lxd_git_project_group: nova_compute nova_lxd_git_project_group: nova_compute
## Sahara service ## Sahara service
sahara_git_repo: https://git.openstack.org/openstack/sahara sahara_git_repo: https://git.openstack.org/openstack/sahara
sahara_git_install_branch: 5eeeab432b95f59b2a1c2db85f1f1a297bd22668 # HEAD of "master" as of 12.09.2016 sahara_git_install_branch: 47579eec40cbed801e5555233bdd054d065e5edf # HEAD of "stable/newton" as of 16.09.2016
sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}" sahara_git_dest: "/opt/sahara_{{ sahara_git_install_branch | replace('/', '_') }}"
sahara_git_project_group: sahara_all sahara_git_project_group: sahara_all
## Swift service ## Swift service
swift_git_repo: https://git.openstack.org/openstack/swift swift_git_repo: https://git.openstack.org/openstack/swift
swift_git_install_branch: d5e484e692c05c5f04069b181a5e4037239bc57c # HEAD of "master" as of 12.09.2016 swift_git_install_branch: acb8971c765fbc64e55f37923e8b16c0126598ac # HEAD of "master" as of 16.09.2016
swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}"
swift_git_project_group: swift_all swift_git_project_group: swift_all
## Ironic service ## Ironic service
ironic_git_repo: https://git.openstack.org/openstack/ironic ironic_git_repo: https://git.openstack.org/openstack/ironic
ironic_git_install_branch: 0e15d37fcffc1e8ee2488089f2ca414eaebd4ed2 # HEAD of "master" as of 12.09.2016 ironic_git_install_branch: 5603a215b726ca465eed2867d830821bb24b1a72 # HEAD of "master" as of 16.09.2016
ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}" ironic_git_dest: "/opt/ironic_{{ ironic_git_install_branch | replace('/', '_') }}"
ironic_git_project_group: ironic_all ironic_git_project_group: ironic_all
## Magnum service ## Magnum service
magnum_git_repo: https://git.openstack.org/openstack/magnum magnum_git_repo: https://git.openstack.org/openstack/magnum
magnum_git_install_branch: 318a7875eed6d7261d5089d8ba035073c510136a # HEAD of "master" as of 12.09.2016 magnum_git_install_branch: 8e7706f4aaa6d1c9600cbc3f301389aea3f337ab # HEAD of "master" as of 16.09.2016
magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}" magnum_git_dest: "/opt/magnum_{{ magnum_git_install_branch | replace('/', '_') }}"
magnum_git_project_group: magnum_all magnum_git_project_group: magnum_all
## Rally service ## Rally service
rally_git_repo: https://git.openstack.org/openstack/rally rally_git_repo: https://git.openstack.org/openstack/rally
rally_git_install_branch: e6f4dafc9a3a788c3388abad32269a38f4809123 # HEAD of "master" as of 12.09.2016 rally_git_install_branch: 8ff0f2ee8c92f748e99138b24124a5c008918555 # HEAD of "master" as of 16.09.2016
rally_git_dest: "/opt/rally_{{ rally_git_install_branch | replace('/', '_') }}" rally_git_dest: "/opt/rally_{{ rally_git_install_branch | replace('/', '_') }}"
rally_git_project_group: utility_all rally_git_project_group: utility_all

View File

@@ -14,9 +14,9 @@
# limitations under the License. # limitations under the License.
calico_git_repo: https://github.com/projectcalico/calico calico_git_repo: https://github.com/projectcalico/calico
calico_git_install_branch: a2daf3725e33a76bdb01c0311d5827f159969a29 # HEAD of "master" as of 12.09.2016 calico_git_install_branch: 1.4.0 # current tag as of 22.07.2016
calico_git_project_group: neutron_all calico_git_project_group: neutron_all
networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
networking_calico_git_install_branch: f162ecbb48685946934681f097b5a164b4fa6243 # HEAD of "master" as of 12.09.2016 networking_calico_git_install_branch: 1.2.0 # current tag as of 01.08.2016
networking_calico_git_project_group: neutron_all networking_calico_git_project_group: neutron_all

View File

@@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
## OpenStack Source Code Release ## OpenStack Source Code Release
openstack_release: master openstack_release: 14.0.0
## Verbosity Options ## Verbosity Options
debug: False debug: False
@@ -36,7 +36,7 @@ rsyslog_client_package_state: "{{ package_state }}"
# These pins are updated through the sources-branch-updater script # These pins are updated through the sources-branch-updater script
pip_packages: pip_packages:
- pip==8.1.2 - pip==8.1.2
- setuptools==27.1.2 - setuptools==27.2.0
- wheel==0.29.0 - wheel==0.29.0
pip_links: pip_links:

View File

@@ -0,0 +1,4 @@
---
features:
- The os_nova role can now deploy the a custom
/etc/libvirt/qemu.conf file by defining ``qemu_conf_dict``.

View File

@@ -0,0 +1,21 @@
---
features:
- |
The role now enables auditing during early boot to comply with the
requirements in V-38438. By default, the GRUB configuration variables in
``/etc/default/grub.d/`` will be updated and the active ``grub.cfg`` will
be updated.
Deployers can opt-out of the change entirely by setting a variable:
.. code-block:: yaml
security_enable_audit_during_boot: no
Deployers may opt-in for the change without automatically updating the
active ``grub.cfg`` file by setting the following Ansible variables:
.. code-block:: yaml
security_enable_audit_during_boot: yes
security_enable_grub_update: no

View File

@@ -0,0 +1,8 @@
---
fixes:
- Add architecture-specific locations for percona-xtrabackup and qpress,
with alternate locations provided for ppc64el due to package inavailability
from the current provider.
issues:
- Deployments on ppc64le are limited to Ubuntu 16.04 for the Newton
release of OpenStack-Ansible.

View File

@@ -0,0 +1,13 @@
---
features:
- |
Although the STIG requires martian packets to be logged, the logging is
now disabled by default. The logs can quickly fill up a syslog server or
make a physical console unusable.
Deployers that need this logging enabled will need to set the following
Ansible variable:
.. code-block:: yaml
security_sysctl_enable_martian_logging: yes

View File

@@ -0,0 +1,6 @@
---
fixes:
- The pip_install_options variable is now honored during repo
building. This variable allows deployers to specify trusted
CA certificates by setting the variable to "--cert
/etc/ssl/certs/ca-certificates.crt"

View File

@@ -0,0 +1,5 @@
---
features:
- New variable ``ceph_extra_confs`` may be defined to support
deployment of extra Ceph config files. This is useful for cinder
deployments that utilize multiple Ceph clusters as cinder backends.

View File

@@ -0,0 +1,15 @@
---
features:
- The ``openstack-ansible-galera_server`` role will now prevent
deployers from changing the ``galera_cluster_name`` variable
on clusters that already have a value set in a running galera
cluster.
You can set the new ``galera_force_change_cluster_name``
variable to ``True`` to force the ``galera_cluster_name``
variable to be changed.
We recommend setting this by running the galera-install.yml playbook
with ``-e galera_force_change_cluster_name=True``, to avoid
changing the ``galera_cluster_name`` variable unintentionally.
Use with caution, changing the ``galera_cluster_name`` value
can cause your cluster to fail, as the nodes won't join if restarted
sequentially.

View File

@@ -0,0 +1,7 @@
---
features:
- The ``rabbitmq_server`` role now supports configuring HiPE compilation
of the RabbitMQ server Erlang code. This configuration option may improve
server performance for some workloads and hardware. Deployers can
override the ``rabbitmq_hipe_compile`` variable, setting a value of
``True`` if they wish to enable this feature.

View File

@@ -0,0 +1,6 @@
---
features:
- The config_template action plugin now has a new option to
toggle list extension for JSON or YAML formats. The new
option is ``list_extend`` and is a boolean. The default
is True which maintains the existing API.

View File

@@ -0,0 +1,22 @@
---
features:
- Introduced option to deploy Keystone under Uwsgi. A new variable
``keystone_mod_wsgi_enabled`` is introduced to toggle this
behavior. The default is ``true`` which continues to deploy with
mod_wsgi for Apache. The ports used by Uwsgi for socket and http
connection for both public and admin Keystone services are
configurable (see also the ``keystone_uwsgi_ports`` dictionary
variable). Other Uwsgi configuration can be overridden by using
the ``keystone_uwsgi_ini_overrides`` variable as documented
under "Overriding OpenStack configuration defaults" in the
OpenStack-Ansible Install Guide. Federation features should be
considered _experimental_ with this configuration at this time.
- Introduced option to deploy Keystone behind Nginx. A new
variable ``keystone_apache_enabled`` is introduced to toggle
this behavior. The default is ``true`` which continues to
deploy with Apache. Additional configuration can be delivered to
Nginx through the use of the ``keystone_nginx_extra_conf`` list
variable. Federation features are not supported with this
configuration at this time. Use of this option requires
``keystone_mod_wsgi_enabled`` to be set to ``false`` which will
deploy Keystone under Uwsgi.

View File

@@ -0,0 +1,4 @@
---
upgrade:
- The variable ``swift_apt_packages`` has been renamed to
``swift_distro_packages``.

View File

@@ -0,0 +1,6 @@
---
features:
- The ``rabbitmq_server`` role now supports deployer override of the
RabbitMQ policies applied to the cluster. Deployers can
override the ``rabbitmq_policies`` variable, providing a list of
desired policies.

View File

@@ -0,0 +1,25 @@
---
upgrade:
- |
All of the discretionary access control (DAC) auditing is now disabled by
default. This reduces the amount of logs generated during deployments and
minor upgrades. The following variables are now set to ``no``:
.. code-block:: yaml
security_audit_DAC_chmod: no
security_audit_DAC_chown: no
security_audit_DAC_lchown: no
security_audit_DAC_fchmod: no
security_audit_DAC_fchmodat: no
security_audit_DAC_fchown: no
security_audit_DAC_fchownat: no
security_audit_DAC_fremovexattr: no
security_audit_DAC_lremovexattr: no
security_audit_DAC_fsetxattr: no
security_audit_DAC_lsetxattr: no
security_audit_DAC_setxattr: no
fixes:
- The auditd rules for auditing V-38568 (filesystem mounts) were incorrectly
labeled in the auditd logs with the key of ``export-V-38568``. They are
now correctly logged with the key ``filesystem_mount-V-38568``.

View File

@@ -0,0 +1,4 @@
---
upgrade:
- The ``ceilometer-api`` init service is removed since ``ceilometer-api`` is
deployed as an apache ``mod_wsgi`` service.

View File

@@ -0,0 +1,8 @@
---
upgrade:
- New overrides are provided to allow for better customization
around logfile retention and rate limiting for UDP/TCP sockets.
``rsyslog_server_logrotation_window`` defaults to 14 days
``rsyslog_server_ratelimit_interval`` defaults to 0 seconds
``rsyslog_server_ratelimit_burst`` defaults to 10000
- The rsyslog.conf is now using v7+ style configuration settings

View File

@@ -0,0 +1,14 @@
---
features:
- The ``openstack-ansible-os_swift`` role will now prevent
deployers from changing the ``swift_hash_path_prefix`` and
``swift_hash_path_suffix`` variables on clusters that already
have a value set in ``/etc/swift/swift.conf``.
You can set the new ``swift_force_change_hashes`` variable to
``True`` to force the ``swift_hash_path_`` variables to be
changed.
We recommend setting this by running the os-swift.yml playbook
with ``-e swift_force_change_hashes=True``, to avoid changing
the ``swift_hash_path_`` variables unintentionally.
Use with caution, changing the ``swift_hash_path_`` values
causes end-user impact.

View File

@@ -0,0 +1,11 @@
---
features:
- Change the port for devices in the ring by adjusting
the port value for services, hosts, or devices. This
will not involve a rebalance of the ring.
- Changing the port for a device, or group of devices,
carries a brief period of downtime to the swift
storage services for those devices. The devices will
be unavailable during period between when the
storage service restarts after the port update, and
the ring updates to match the new port.

View File

@@ -21,7 +21,7 @@ MAX_RETRIES=${MAX_RETRIES:-5}
REPORT_DATA=${REPORT_DATA:-""} REPORT_DATA=${REPORT_DATA:-""}
ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-" -e 'gather_facts=False' "} ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-" -e 'gather_facts=False' "}
STARTTIME="${STARTTIME:-$(date +%s)}" STARTTIME="${STARTTIME:-$(date +%s)}"
PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==27.1.2 wheel==0.29.0 '} PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==27.2.0 wheel==0.29.0 '}
# The default SSHD configuration has MaxSessions = 10. If a deployer changes # The default SSHD configuration has MaxSessions = 10. If a deployer changes
# their SSHD config, then the ANSIBLE_FORKS may be set to a higher number. We # their SSHD config, then the ANSIBLE_FORKS may be set to a higher number. We

View File

@@ -22,6 +22,7 @@ OS_BRANCH=${OS_BRANCH:-"master"}
OSA_BRANCH=${OSA_BRANCH:-"$OS_BRANCH"} OSA_BRANCH=${OSA_BRANCH:-"$OS_BRANCH"}
SERVICE_FILE=${SERVICE_FILE:-"playbooks/defaults/repo_packages/openstack_services.yml"} SERVICE_FILE=${SERVICE_FILE:-"playbooks/defaults/repo_packages/openstack_services.yml"}
OPENSTACK_SERVICE_LIST=${OPENSTACK_SERVICE_LIST:-"$(grep 'git_repo\:' ${SERVICE_FILE} | awk -F '/' '{ print $NF }' | egrep -v 'requirements|-' | tr '\n' ' ')"} OPENSTACK_SERVICE_LIST=${OPENSTACK_SERVICE_LIST:-"$(grep 'git_repo\:' ${SERVICE_FILE} | awk -F '/' '{ print $NF }' | egrep -v 'requirements|-' | tr '\n' ' ')"}
PRE_RELEASE=${PRE_RELEASE:-"false"}
IFS=$'\n' IFS=$'\n'
@@ -110,10 +111,13 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do
find ${os_repo_tmp_path}/etc -name "policy.json" -exec \ find ${os_repo_tmp_path}/etc -name "policy.json" -exec \
cp {} "${osa_repo_tmp_path}/templates/policy.json.j2" \; cp {} "${osa_repo_tmp_path}/templates/policy.json.j2" \;
# Tweak the paste files # Tweak the paste files for any hmac key entries
find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \ find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \
sed -i.bak "s|hmac_keys = SECRET_KEY|hmac_keys = {{ ${repo_name}_profiler_hmac_key }}|" {} \; sed -i.bak "s|hmac_keys = SECRET_KEY|hmac_keys = {{ ${repo_name}_profiler_hmac_key }}|" {} \;
sed -i.bak "s|pipeline = gnocchi+noauth|pipeline = {{ (gnocchi_keystone_auth | bool) | ternary('gnocchi+noauth', 'gnocchi+auth') }}|" {} \;
# Tweak the gnocchi paste file to support keystone auth
find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \
sed -i.bak "s|pipeline = gnocchi+noauth|pipeline = {{ (gnocchi_keystone_auth \| bool) \| ternary('gnocchi+noauth', 'gnocchi+auth') }}|" {} \;
# Update the paste files # Update the paste files
find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \ find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \
@@ -196,25 +200,34 @@ echo "Updated pip install options/pins"
# Update the ansible-role-requirements.yml file # Update the ansible-role-requirements.yml file
# We don't want to be doing this for the master branch # We don't want to be doing this for the master branch
if [[ "${OSA_BRANCH}" != "master" ]]; then if [ "${OSA_BRANCH}" != "master" ] || [ "${PRE_RELEASE}" == "true" ]; then
echo "Updating ansible-role-requirements.yml" echo "Updating ansible-role-requirements.yml"
if [ "${PRE_RELEASE}" == "true" ]; then
ROLE_GIT_SOURCES=$(awk '/src: .*/ {print $2}' ansible-role-requirements.yml)
else
ROLE_GIT_SOURCES=$(awk '/src: .*\/openstack\// {print $2}' ansible-role-requirements.yml)
fi
# Loop through each of the role git sources, only looking for openstack roles # Loop through each of the role git sources, only looking for openstack roles
for role_src in $(awk '/src: .*\/openstack\// {print $2}' ansible-role-requirements.yml); do for role_src in ${ROLE_GIT_SOURCES}; do
# Determine the role's name # Determine the role's name
role_name=$(sed 's/^[ \t-]*//' ansible-role-requirements.yml | awk '/src: / || /name: / {print $2}' | grep -B1 "${role_src}" | head -n 1) role_name=$(sed 's/^[ \t-]*//' ansible-role-requirements.yml | awk '/src: / || /name: / {print $2}' | grep -B1 "${role_src}" | head -n 1)
echo "... updating ${role_name}" echo "... updating ${role_name}"
# Grab the latest SHA that matches the specified branch # If the role_src is NOT from git.openstack.org, try to get a tag first
role_version=$(git ls-remote ${role_src} | grep "${OSA_BRANCH}$" | awk '{print $1}') if [[ ${role_src} != *"git.openstack.org"* ]]; then
# If that branch doesn't exist, then it's probably not an OpenStack-Ansible role, so grab the latest tag instead
if [[ -z "${role_version}" ]]; then
role_version=$(git ls-remote --tags ${role_src} | awk '{print $2}' | grep -v '{}' | cut -d/ -f 3 | sort -n | tail -n 1) role_version=$(git ls-remote --tags ${role_src} | awk '{print $2}' | grep -v '{}' | cut -d/ -f 3 | sort -n | tail -n 1)
else fi
# As this is an OSA role, we want to grab the release notes from it
# Grab the latest SHA that matches the specified branch
if [[ -z "${role_version}" ]]; then
role_version=$(git ls-remote ${role_src} | grep "${OSA_BRANCH}$" | awk '{print $1}')
fi
# For OSA roles, get the release notes
if [[ ${role_src} == *"git.openstack.org"* ]]; then
# Setup a var for tmp space # Setup a var for tmp space
osa_repo_tmp_path="/tmp/osa_${role_name}" osa_repo_tmp_path="/tmp/osa_${role_name}"
@@ -238,6 +251,8 @@ if [[ "${OSA_BRANCH}" != "master" ]]; then
# Now use the information we have to update the ansible-role-requirements file # Now use the information we have to update the ansible-role-requirements file
"$(dirname "${0}")/ansible-role-requirements-editor.py" -f ansible-role-requirements.yml -n "${role_name}" -v "${role_version}" "$(dirname "${0}")/ansible-role-requirements-editor.py" -f ansible-role-requirements.yml -n "${role_name}" -v "${role_version}"
unset role_version
done done
echo "Completed updating ansible-role-requirements.yml" echo "Completed updating ansible-role-requirements.yml"
else else