openstack/openstack-ansible
Code Issues Proposed changes

Update all SHAs for 14.0.0

Browse Source 
This patch updates all the roles to the latest available stable
SHA's, copies the release notes from the updated roles into the
integrated repo, updates all the OpenStack Service SHA's, and
updates the appropriate python requirements pins.

Some adjustments are made to the sources-branch-updater script
for improved error detection and efficiency. Also, based on
https://review.openstack.org/371999 the ternary search/replace
is fixed.

Tempest and Rally repo sources are co-located in the repo_packages
files as neither of them implement stable/* branches.

The nova consoles (novnc/spice) are implemented in their own
repo_packages file in order to simplify doing the SHA updates.

Gnocchi implements a different style of releasing stable branches
so it is also implemented in its own repo_packages file.

Change-Id: I6fa4afab4203c9902ce70fa6bc49ad1dddb560b3
This commit is contained in:
Jesse Pretorius 2016-09-19 16:17:04 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 5098998d64
commit f40ecdeba2
16 changed files with 199 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
ansible-role-requirements.yml
View File

@ -1,27 +1,27 @@
- 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: 1c01428d33a3a3f3c9cd59cb3f97d89a9af70900 version: 60cda7812676f5c17695f1c6e37e1080ff3098fc
- 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: 4ca560ae7865d08ad90958771d7f69753c5843c7 version: b19b0e592045a11f8bd0b811cbb2e1f0faf138c5
- 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: acc80d216905d20f19238af496c96d4e9f6fe667 version: 0c1640c6d22d17dd3b3e8b15f5c78850933b8006
- 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: 21aaa7cc4fae3867bef27094e6a997ca40f54da6 version: 73595132cb5a9ef5ea7809ed1caefa940d325346
- 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: aa47f369ab9cf4a77d49f25b6703fe213d371d54 version: 4886213c8dc97c20aaa276108e18f8df47dad1f9
- 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: 9714f8e5f33221016329329a0cd8d4cfd64842dd version: 775e6126c162c1cbf943f915cbd23ab57a8d6837
- name: keepalived - name: keepalived
scm: git scm: git
src: https://github.com/evrardjp/ansible-keepalived src: https://github.com/evrardjp/ansible-keepalived
@ -29,59 +29,59 @@
- 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: b35928cf83360a2ac8439dd2e43fb7bb0cc366c2 version: db485a4382619b7202b8056faf4ae8b531746f05
- 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: cf65c6736bccae88511b11a3ae85bcc82cd3b322 version: f5ae22d4a05553d7cde026bcf248ba881175a683
- 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: 04941492c38eb80826422980b16d5cabebd5cd3f version: 6e4b41c97a6770a61652ed40a6bfc7eec45ce1ca
- 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: 4cdf533565817f42fcd2c52eb20ee467e884436b version: bb37cfdd10caff1956f530a721dd6a49fbb8c9b1
- 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: 4ec13b9c97d7696cefd1cba2996538c95bbd64ff version: 2faa7510dc8f9e10f73189050f42f264cfbce107
- 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: 1bfcd10bc58686b07e162d445ea7271d63072313 version: 4cb21da177af4c889832a7556256601053820089
- 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: 62e3065441f3d714fd9b481288f716b60482d22e version: fc52dc5fb5561298c16b8edf73e7d19f2a86db7c
- 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: 33b71bad0bae2b178b54af2252b6547b895a0326 version: f1e930dec333aa246860df9a4b99ecd393885da8
- 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: a86683982d8973d2788a5088f97cd7b531e8a786 version: 90c7282d4b14675d5083810abf892d5b7b8f65e9
- 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: 5653c1122be16ea1e2d8dd7f39229f13aad7b2ef version: 1e2d1c097ca8b7a41e715fdf8c6b157b7ce48e6a
- 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: 482a97671c1e2594188331b95024b603623346a6 version: eb213fcd43553bb8cff64c717ae987e358f352cd
- 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: 6de1e4b69958610bb226a35f46cc446c1ae3a61e version: d70411885726899a048d1d684cbc9f3e5c0e24f1
- 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: 3668e42adf8b909fc0bcee0422a9a642c9b55c24 version: 8fb85830d7a0f73d660d8b6e783ce4d30654114f
- 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: f3274370baf4b2f0e69e2f58603bf8daface709d version: 988006d22d9e357e988ae13008d3137c84473e67
- 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
@ -89,27 +89,27 @@
- 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: 703704b30908b1211368d1678aa693fca204b361 version: b1a2dc2a8fb316f270d057fdb29856921a6f1156
- 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: 687c89a5ab9c971d5da70facb34608f322a0d6f0 version: f6457c31bf5712ade1890ba96525a131bc82bb83
- 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: 9e998b52ee0e66d1510a40691390e9a896631921 version: 0d075aad354b4fd707810ac4de1b3e734a2ebb8a
- 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: 95356e8ac076dad6b4e75e6b506952140b25de47 version: e1a0b49d8c4783982dba469c5b5602381d98433d
- 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: db45ff4977dc8e26d69179ed699513fea3a4a3ba version: d08df5d06d7733af90dbc5c6684b39c5bc3b96a6
- 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: 620edb7a2dd5a4ac4e9e672a0798324b302a814d version: c6dd7711982551d6bae0a21bf7ab223e31284c6e
- 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
@ -117,27 +117,27 @@
- 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: 7af6721b4520ee96209e482bd66247afcfa7b4e5 version: 5e0fd583f1befb96de891ff39acd73e06d72ba44
- 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: 716494ee8660737925cc625cee9e74d633b4d942 version: 6e693f2b68af02f18488462a69680bbdd475af18
- 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: 58ebe254dee0f9c69270d67a048b453cec36c932 version: 2988bee14a7ebcc7723f61b40a75dfad2d26b1f3
- 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: 182da652ea347d2740456672f2e31738dfe9b3d3 version: 75d800036977659ff74e75fd86a5788989a377fc
- 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: 03049027af8e52f9808a81c4e741997fedeeeaa4 version: d11071f283c70b2bde314414749f006e3dc023ec
- 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: 53bbb2f44dd3c7ce974fe050b4e68555fd8ced84 version: 2d196fb8b3b9a01c8a4d495e2f8ccdf121b809be
- name: sshd - name: sshd
scm: git scm: git
src: https://github.com/willshersystems/ansible-sshd src: https://github.com/willshersystems/ansible-sshd

2
global-requirement-pins.txt
View File

@ -10,5 +10,5 @@
### 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.2.0 setuptools==27.3.0
wheel==0.29.0 wheel==0.29.0

2
playbooks/defaults/repo_packages/gnocchi.yml
View File

@ -33,6 +33,6 @@
## This service has a different stable branch strategy to the rest of OpenStack. ## This service has a different stable branch strategy to the rest of OpenStack.
## The SHA is recorded here to make the SHA updating easier. ## The SHA is recorded here to make the SHA updating easier.
gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi gnocchi_git_repo: https://git.openstack.org/openstack/gnocchi
gnocchi_git_install_branch: 85b6854bbc574731a2ffdfa5c10e63a9ae7763e6 # HEAD of "master" as of 16.09.2016 gnocchi_git_install_branch: 5594840a7187964dc29f5aebd5947c58c03e3380 # HEAD of "master" as of 21.09.2016
gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}" gnocchi_git_dest: "/opt/gnocchi_{{ gnocchi_git_install_branch | replace('/', '_') }}"
gnocchi_git_project_group: gnocchi_all gnocchi_git_project_group: gnocchi_all

10
playbooks/defaults/repo_packages/openstack_other.yml → playbooks/defaults/repo_packages/nova_consoles.yml
View File

@ -25,21 +25,15 @@
## package should be one long name with no additional `_` separating it. ## 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: 3b0a86f7b8a7a5e8911a2cf7006c469efdbcad06 # HEAD of "master" as of 16.09.2016
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
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 16.09.2016 novncproxy_git_install_branch: 33e1462999d78bafff55be9723a90c6498d2d9e8 # HEAD of "master" as of 20.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 16.09.2016 spicehtml5_git_install_branch: 54cc41299bea8cd681ed0262735e0fd821cd774a # HEAD of "master" as of 20.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

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

@ -31,159 +31,153 @@
## 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: e2edc35050a99503987cec4120309804f41a830d # HEAD of "master" as of 16.09.2016 requirements_git_install_branch: c589637b184e77901d37cc7faa93dbb906979448 # HEAD of "stable/newton" as of 21.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: caf9f2e1c252835bda8d2b17b7d1239fcaa9a9ba # HEAD of "stable/newton" as of 16.09.2016 aodh_git_install_branch: caf9f2e1c252835bda8d2b17b7d1239fcaa9a9ba # HEAD of "stable/newton" as of 21.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: 91d4a9479d4835b1b012ab55eeb678774bf38c76 # HEAD of "master" as of 16.09.2016 ceilometer_git_install_branch: 9eb8b652bcec998bf14832151338d9e2b3f061d8 # HEAD of "stable/newton" as of 21.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: 0ba267fbc1836722735102994b466ecd7803b10a # HEAD of "stable/newton" as of 16.09.2016 cinder_git_install_branch: d3f37914164ecb8b028f1b46ae3121fe89182f8b # HEAD of "stable/newton" as of 21.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: ee667852f588415259bc7b5dbe07b6037da66226 # HEAD of "stable/newton" as of 16.09.2016 glance_git_install_branch: 912d1fb3bacef539dc804ab30b1f4bf85d3b32a8 # HEAD of "stable/newton" as of 21.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
## 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: 5dc1084260c8a7a7f5ec97d0cdfc1fc08cd8f82e # HEAD of "stable/newton" as of 16.09.2016 heat_git_install_branch: 847fca33f00003aaa97cbdd085b6f87dd98d44de # HEAD of "stable/newton" as of 21.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: f9774acb7345b644d344af3af2f350170db38dfd # HEAD of "stable/newton" as of 16.09.2016 horizon_git_install_branch: 1e6614a41fc8ad5d100641d6962c3fb5896dae61 # HEAD of "stable/newton" as of 21.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 16.09.2016 ironic_dashboard_git_install_branch: 7d226b75dae84607925a54b10f60a6a83baf9ac0 # HEAD of "master" as of 21.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: 28c55311f09d0b8294fec279bf89fa60582c4c6c # HEAD of "master" as of 16.09.2016 magnum_dashboard_git_install_branch: 726ca1d39ee28afe0eb16cba617a59ae78ad359a # HEAD of "stable/newton" as of 21.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: 2ffb6c930f4c230d0ff888064b6de36aa34cd12f # HEAD of "master" as of 16.09.2016 neutron_lbaas_dashboard_git_install_branch: 2ffb6c930f4c230d0ff888064b6de36aa34cd12f # HEAD of "master" as of 21.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: 8b6b41cf3f648bbba334496b28d7966d7832da74 # HEAD of "stable/newton" as of 16.09.2016 sahara_dashboard_git_install_branch: f1215445f1a6b7ea87f75fa85a1ac7a8f3b2fdb3 # HEAD of "stable/newton" as of 21.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: 6eeb354a78084e83d672f5a0e890e8832d87c19f # HEAD of "stable/newton" as of 16.09.2016 keystone_git_install_branch: b3fae7724db797c911bedec1e9ab1ded982691c5 # HEAD of "stable/newton" as of 21.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: b05549f67151883c4a6463540bb57c4513408675 # HEAD of "master" as of 16.09.2016 neutron_git_install_branch: b49f590fa12aae9a677e38472a467cf8dfbb317b # HEAD of "stable/newton" as of 21.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: d1693c10ea618f3a15086fa694c792dc65f26a94 # HEAD of "master" as of 16.09.2016 neutron_lbaas_git_install_branch: 10d8a18baa47b5c1a481e1d2fe53fb798ec62175 # HEAD of "stable/newton" as of 21.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: 3c93dc6c136557761fc3bf0a16097180f9f0fe65 # HEAD of "master" as of 16.09.2016 neutron_vpnaas_git_install_branch: 89dac51538b711d8e966d4a4a50f9cdfafa92fc5 # HEAD of "stable/newton" as of 21.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: 71f2220d2c0a6c3c1c375c904b17103ec505769b # HEAD of "master" as of 16.09.2016 neutron_fwaas_git_install_branch: 48e58a61712c337226a0e6705f080bfc4c3fe1f2 # HEAD of "stable/newton" as of 21.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: 26a252e3d7db2e1fb5dc72058e5b25cd283d00e2 # HEAD of "master" as of 16.09.2016 neutron_dynamic_routing_git_install_branch: 2b27679fb6d690e6f65a98dfa2828bc367aa30ad # HEAD of "stable/newton" as of 21.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: d4b35152c0ac2f3f2b4d158c83dba249d6d2ff0c # HEAD of "stable/newton" as of 16.09.2016 nova_git_install_branch: 0cb20bb0145b4cd770553f8e0899234ceaf5063a # HEAD of "stable/newton" as of 21.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: 89b47fcfc5a8d7f062ef6d845658b4a1b480a487 # HEAD of "master" as of 16.09.2016 nova_powervm_git_install_branch: 1373fad17a05232c887f7c15f3abb288a75e1f21 # HEAD of "stable/newton" as of 21.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: 3a24f8676e20a4ad96815b2c33ff614361a06dc8 # HEAD of "master" as of 16.09.2016 nova_lxd_git_install_branch: 8f7dca4e4b0b910eeaea4370c968be9032a1491a # HEAD of "master" as of 21.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: 47579eec40cbed801e5555233bdd054d065e5edf # HEAD of "stable/newton" as of 16.09.2016 sahara_git_install_branch: 5c775d2e84e0fee2524fa53c82549af64aa808a9 # HEAD of "stable/newton" as of 21.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: acb8971c765fbc64e55f37923e8b16c0126598ac # HEAD of "master" as of 16.09.2016 swift_git_install_branch: e07f9be8f5db130361a2bf106b6c7f1ac9bdd841 # HEAD of "master" as of 21.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: 5603a215b726ca465eed2867d830821bb24b1a72 # HEAD of "master" as of 16.09.2016 ironic_git_install_branch: 2351d624aed7aae9d58ce37676c0181687be0e8a # HEAD of "master" as of 21.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: 8e7706f4aaa6d1c9600cbc3f301389aea3f337ab # HEAD of "master" as of 16.09.2016 magnum_git_install_branch: a10ac080c7f63fe255c015bb9337f9adb97f83d9 # HEAD of "stable/newton" as of 21.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_git_repo: https://git.openstack.org/openstack/rally
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_project_group: utility_all

39
playbooks/defaults/repo_packages/openstack_testing.yml Normal file
View File

@ -0,0 +1,39 @@
---
# 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: 304802830b56354a83bad86925851107411d45ec # HEAD of "master" as of 21.09.2016
tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}"
tempest_git_project_group: utility_all
## Rally service
rally_git_repo: https://git.openstack.org/openstack/rally
rally_git_install_branch: f1a9abd5c9922b3d67d1e69a80cf96eda2bdac59 # HEAD of "master" as of 21.09.2016
rally_git_dest: "/opt/rally_{{ rally_git_install_branch | replace('/', '_') }}"
rally_git_project_group: utility_all

2
playbooks/haproxy-install.yml
View File

@ -49,8 +49,6 @@
state: "absent" state: "absent"
with_items: with_items:
- "keystone_internal" - "keystone_internal"
tags:
- haproxy-config # this tag is present because the task is ONLY a config task
when: internal_lb_vip_address == external_lb_vip_address when: internal_lb_vip_address == external_lb_vip_address
tags: tags:
- haproxy-config # this tag is present because the task is ONLY a config task - haproxy-config # this tag is present because the task is ONLY a config task

2
playbooks/inventory/group_vars/all.yml
View File

@ -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.2.0 - setuptools==27.3.0
- wheel==0.29.0 - wheel==0.29.0
pip_links: pip_links:

2
playbooks/os-nova-install.yml
View File

@ -173,7 +173,7 @@
tags: tags:
- crontab - crontab
vars_files: vars_files:
- defaults/repo_packages/openstack_other.yml - defaults/repo_packages/nova_consoles.yml
vars: vars:
is_metal: "{{ properties.is_metal|default(false) }}" is_metal: "{{ properties.is_metal|default(false) }}"
nova_galera_user: nova nova_galera_user: nova

2
playbooks/os-tempest-install.yml
View File

@ -32,7 +32,7 @@
tags: tags:
- crontab - crontab
vars_files: vars_files:
- defaults/repo_packages/openstack_other.yml - defaults/repo_packages/openstack_testing.yml
vars: vars:
# This sets the tempest group to the utility group # This sets the tempest group to the utility group
tempest_main_group: utility_all tempest_main_group: utility_all

10
releasenotes/notes/disable-list-extend-3a9547de9034f9ba.yaml Normal file
View File

@ -0,0 +1,10 @@
---
features:
- Yaml files used for ceilometer configuration will now allow a deployer to
override a given list. If an override is provided that matches an already
defined list in one of the ceilometer default yaml files the entire list
will be replaced by the provided override. Previously, a nested lists of
lists within the default ceilometer configration files would extend should
a deployer provide an override matching an existing pipeline. The
extension of the defaults had a high probability to cause undesirable
outcomes and was very unpredictable.

4
releasenotes/notes/glance-packages-rename-abd348b0725e4b7b.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- The ``glance_apt_packages`` variable has been renamed to
``glance_distro_packages`` so that it applies to multiple operating systems.

4
releasenotes/notes/os_glance-centos7-support-21cb81e361831c9f.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- CentOS7/RHEL support has been added to the os_glance
role.

5
releasenotes/notes/support-global_environment_variables-46cd4d90279fd0e9.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- The repo_build play now correctly evaluates environment
variables configured in /etc/environment. This enables
deployments in an environment with http proxies.

2
scripts/scripts-library.sh
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.2.0 wheel==0.29.0 '} PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.2 setuptools==27.3.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

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

@ -93,88 +93,94 @@ for repo in $(grep 'git_repo\:' ${SERVICE_FILE}); do
rm -rf ${os_repo_tmp_path} ${osa_repo_tmp_path} rm -rf ${os_repo_tmp_path} ${osa_repo_tmp_path}
# Do a shallow clone of the OpenStack repo to work with # Do a shallow clone of the OpenStack repo to work with
git clone --quiet --depth=10 --branch ${OS_BRANCH} --no-checkout --single-branch ${repo_address} ${os_repo_tmp_path} if git clone --quiet --depth=10 --branch ${OS_BRANCH} --no-checkout --single-branch ${repo_address} ${os_repo_tmp_path}; then
pushd ${os_repo_tmp_path} > /dev/null pushd ${os_repo_tmp_path} > /dev/null
git checkout --quiet ${branch_sha} git checkout --quiet ${branch_sha}
popd > /dev/null popd > /dev/null
# Set the OSA address # Set the OSA address
osa_repo_address="https://git.openstack.org/openstack/openstack-ansible-os_${repo_name}" osa_repo_address="https://git.openstack.org/openstack/openstack-ansible-os_${repo_name}"
# Do a shallow clone of the OSA repo to work with # Do a shallow clone of the OSA repo to work with
git clone --quiet --depth=10 --branch ${OSA_BRANCH} --single-branch ${osa_repo_address} ${osa_repo_tmp_path} if git clone --quiet --depth=10 --branch ${OSA_BRANCH} --single-branch ${osa_repo_address} ${osa_repo_tmp_path}; then
pushd ${osa_repo_tmp_path} > /dev/null pushd ${osa_repo_tmp_path} > /dev/null
git checkout --quiet origin/${OSA_BRANCH} git checkout --quiet origin/${OSA_BRANCH}
popd > /dev/null popd > /dev/null
# Update the policy files # Update the policy files
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 for any hmac key entries # 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 }}|" {} \;
# Tweak the gnocchi paste file to support keystone auth # Tweak the gnocchi paste file to support keystone auth
find ${os_repo_tmp_path}/etc -name "*[_-]paste.ini" -exec \ if [ "${repo_name}" = "gnocchi" ]; then
sed -i.bak "s|pipeline = gnocchi+noauth|pipeline = {{ (gnocchi_keystone_auth \| bool) \| ternary('gnocchi+noauth', 'gnocchi+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+auth', 'gnocchi+noauth') }}|" {} \;
fi
# 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 \
bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(basename \${name}).j2\"" \; bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(basename \${name}).j2\"" \;
# Tweak the rootwrap conf filters_path (for os_neutron only) # Tweak the rootwrap conf filters_path (for neutron only)
find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \ if [ "${repo_name}" = "neutron" ]; then
sed -i.bak "s|filters_path=/etc/neutron|filters_path={{ ${repo_name}_conf_dir }}|" {} \; find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \
sed -i.bak "s|filters_path=/etc/neutron|filters_path={{ ${repo_name}_conf_dir }}|" {} \;
fi
# Tweak the rootwrap conf exec_dirs # Tweak the rootwrap conf exec_dirs
find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \ find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \
sed -i.bak "s|exec_dirs=|exec_dirs={{ ${repo_name}_bin }},|" {} \; sed -i.bak "s|exec_dirs=|exec_dirs={{ ${repo_name}_bin }},|" {} \;
# Update the rootwrap conf files # Update the rootwrap conf files
find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \ find ${os_repo_tmp_path}/etc -name "rootwrap.conf" -exec \
cp {} "${osa_repo_tmp_path}/templates/rootwrap.conf.j2" \; cp {} "${osa_repo_tmp_path}/templates/rootwrap.conf.j2" \;
# Update the rootwrap filters # Update the rootwrap filters
find ${os_repo_tmp_path}/etc -name "*.filters" -exec \ find ${os_repo_tmp_path}/etc -name "*.filters" -exec \
bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/files/rootwrap.d/\$(basename \${name})\"" \; bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/files/rootwrap.d/\$(basename \${name})\"" \;
# Update the yaml files for Ceilometer # Update the yaml files for Ceilometer
if [ "${repo_name}" = "ceilometer" ]; then if [ "${repo_name}" = "ceilometer" ]; then
find ${os_repo_tmp_path}/etc -name "*.yaml" -exec \ find ${os_repo_tmp_path}/etc -name "*.yaml" -exec \
bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(basename \${name}).j2\"" \; bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(basename \${name}).j2\"" \;
fi fi
# Update the yaml files for Heat # Update the yaml files for Heat
if [ "${repo_name}" = "heat" ]; then if [ "${repo_name}" = "heat" ]; then
find ${os_repo_tmp_path}/etc -name "*.yaml" -exec \ find ${os_repo_tmp_path}/etc -name "*.yaml" -exec \
bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(echo \${name} | rev | cut -sd / -f -2 | rev).j2\"" \; bash -c "name=\"{}\"; cp \${name} \"${osa_repo_tmp_path}/templates/\$(echo \${name} | rev | cut -sd / -f -2 | rev).j2\"" \;
fi fi
# Switch into the OSA git directory to work with it # Switch into the OSA git directory to work with it
pushd ${osa_repo_tmp_path} > /dev/null pushd ${osa_repo_tmp_path} > /dev/null
# Check for changed files # Check for changed files
git_changed=$(git status --porcelain | wc -l) git_changed=$(git status --porcelain | wc -l)
# Check for untracked files # Check for untracked files
git_untracked=$(git ls-files --other --exclude-standard --directory | wc -l) git_untracked=$(git ls-files --other --exclude-standard --directory | wc -l)
if [ ${git_untracked} -gt 0 ]; then if [ ${git_untracked} -gt 0 ]; then
# If there are untracked files, ensure that the commit message includes # If there are untracked files, ensure that the commit message includes
# a WIP prefix so that the patch is revised in more detail. # a WIP prefix so that the patch is revised in more detail.
git_msg_prefix="[New files - needs update] " git_msg_prefix="[New files - needs update] "
else else
git_msg_prefix="" git_msg_prefix=""
fi
# If any files have changed, submit a patch including the changes
if [ ${git_changed} -gt 0 ]; then
git checkout -b sha-update
git review -s > /dev/null
git add --all
git commit -a -m "${git_msg_prefix}Update paste, policy and rootwrap configurations $(date +%Y-%m-%d)" --quiet
git review > /dev/null
fi
popd > /dev/null
fi fi
fi
# If any files have changed, submit a patch including the changes
if [ ${git_changed} -gt 0 ]; then
git checkout -b sha-update
git review -s > /dev/null
git add --all
git commit -a -m "${git_msg_prefix}Update paste, policy and rootwrap configurations $(date +%Y-%m-%d)" --quiet
git review > /dev/null
fi
popd > /dev/null
# Clean up the temporary files # Clean up the temporary files
rm -rf ${os_repo_tmp_path} ${osa_repo_tmp_path} rm -rf ${os_repo_tmp_path} ${osa_repo_tmp_path}