summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-08-30 20:07:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-30 20:07:27 +0000
commit9d434f81639e8692826f37e1887c65e29ac28809 (patch)
tree6fafad3dab1e0a6d5c4dc6165ec41d1d3b7a25f7
parenta7337ec6ddc3d60690278e2bd75bd5892c44c05f (diff)
parentf69e62cdf7b5f75d2104a6184f5e02cb07d02682 (diff)
Merge "xci: Bump OSA and bifrost SHAs"
-rwxr-xr-xxci/config/env-vars6
-rwxr-xr-xxci/config/pinned-versions20
-rw-r--r--xci/installer/osa/files/ansible-role-requirements.yml110
-rw-r--r--xci/installer/osa/files/openstack_services.yml89
4 files changed, 119 insertions, 106 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index 36ae97c0..898c5722 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -45,9 +45,11 @@ export LOG_PATH=${LOG_PATH:-${XCI_PATH}/xci/logs}
# This currently matches to OSA Ansible version but it doesn't really
# matter since bifrost and OSA will use the Ansible version they need.
# Overall, it's better to use what OSA supports so we can use new features.
+# OSA currently has 2.5.5 which breaks due to missing
+# https://github.com/ansible/ansible/commit/67859c3476501d5d9839fd904aec55468d09593a
+# This was fixed in 2.5.6 so remove the pin when OSA updates to newer version.
#export XCI_ANSIBLE_PIP_VERSION=${XCI_ANSIBLE_PIP_VERSION:-$(curl -s https://raw.githubusercontent.com/openstack/openstack-ansible/${OPENSTACK_OSA_VERSION}/scripts/bootstrap-ansible.sh | grep ansible== | sed -n "s/.*ansible==\([0-9.]*\).*/\1/p")}
-# bifrost needs 2.4 but OSA is currently on 2.6
-export XCI_ANSIBLE_PIP_VERSION="2.4.6.0"
+export XCI_ANSIBLE_PIP_VERSION="2.5.8"
export ANSIBLE_HOST_KEY_CHECKING=False
# subject of the certificate
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions
index b5f5480d..00340f30 100755
--- a/xci/config/pinned-versions
+++ b/xci/config/pinned-versions
@@ -25,18 +25,18 @@
#-------------------------------------------------------------------------------
# use releng-xci from master until the development work with the sandbox is complete
export OPNFV_RELENG_VERSION="master"
-# HEAD of bifrost "master" as of 17.08.2018
-export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"c1c6fb7487d5b967624400623fd35aabf303b917"}
-# HEAD of ironic "master" as of 17.08.2018
-export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-"d792111b46e37181f1447d697f32a6023208df04"}
-# HEAD of ironic-client "master" as of 17.08.2018
+# HEAD of bifrost "master" as of 30.08.2018
+export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"0d0cfd908d10a670668619c575fd338d1ff328b7"}
+# HEAD of ironic "master" as of 30.08.2018
+export BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-"0a10eb7794e1543ce2be09c0a55b62fa005b0710"}
+# HEAD of ironic-client "master" as of 30.08.2018
export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"d30d415684f979fa78c70a738f90dab06b77a046"}
-# HEAD of ironic-inspector "master" as of 17.08.2018
-export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"be06e77dabbbd5ffa4ff48a1a676305c4db2f581"}
-# HEAD of ironic-inspector-client "master" as of 17.08.2018
+# HEAD of ironic-inspector "master" as of 30.08.2018
+export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"56138d8f06f531fadc184b0e0efa537c9ad66022"}
+# HEAD of ironic-inspector-client "master" as of 30.08.2018
export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"6eed85c38ee63ade0c2720120fbc9d0520c14f55"}
-# HEAD of osa "stable/rocky" as of 17.08.2018
-export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"cbfdb7dc295ff702044b807336fab067d84a3f20"}
+# HEAD of osa "stable/rocky" as of 30.08.2018
+export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"b9d9269528ecbe04b2638a73c2b0f49839f27422"}
export KEEPALIVED_VERSION=$(grep -E '.*name: keepalived' -A 3 \
${XCI_PATH}/xci/installer/osa/files/ansible-role-requirements.yml \
| tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p')
diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml
index 551afff8..5905dc51 100644
--- a/xci/installer/osa/files/ansible-role-requirements.yml
+++ b/xci/installer/osa/files/ansible-role-requirements.yml
@@ -7,148 +7,148 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-# these versions are based on the osa commit cbfdb7dc295ff702044b807336fab067d84a3f20 on 2018-08-17
-# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=cbfdb7dc295ff702044b807336fab067d84a3f20
+# these versions are based on the osa commit b9d9269528ecbe04b2638a73c2b0f49839f27422 on 2018-08-28
+# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=b9d9269528ecbe04b2638a73c2b0f49839f27422
- name: ansible-hardening
scm: git
src: https://git.openstack.org/openstack/ansible-hardening
- version: 98ea9c853dd21976bd5aa6d651c7ac4120d378d3
+ version: d6d2b22e48f9295522b06bbd6a30b4a7d9168020
- name: apt_package_pinning
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
- version: 0cedf5bd56711cc5970ed19568975ae6580cc275
+ version: 4b2584d699c79ac65acfeb2157a97327df6f0fd6
- name: pip_install
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-pip_install
- version: 1c353c2c4df1284dbf074de23bc9169cc1ed5b36
+ version: ac497c25107f7e16f8e6a64f16e114706e10eff0
- name: galera_client
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_client
- version: dcb176a80900d6c339e8a47a902c58890aac5f48
+ version: 680779b74368a0336987d4f956959118db051716
- name: galera_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-galera_server
- version: e31b62bc97f9ec90caf33005a4d3160b31cd5157
+ version: 256b7350fff2a0aec2a8921a867c63ecb067d230
- name: ceph_client
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-ceph_client
- version: 69df4e13b4d08935b6db3f8a353d0b7f9125c756
+ version: 54301d205b20ee2fb9615addfd6185b62388ab99
- name: haproxy_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server
- version: 9458e7595f9eb712ec531745a2f866bf54d19aaf
+ version: 3dfda4ca5df51f80147730b1922f81942348f5f0
- name: keepalived
scm: git
src: https://github.com/evrardjp/ansible-keepalived
- version: 3.1.3
+ version: 64764d25ab868417f1138a7b9605f2eb94cbfd02
- name: lxc_container_create
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
- version: ecc66e996d0ab9ee2fb5ba5ef79a03d444748d61
+ version: 747c2ecab825347700fb54b07d5324952066188c
- name: lxc_hosts
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
- version: 66e55606b86cfc58a4c75600636c978b8a3e6d16
+ version: 8bbe3fc367fff2f3a74efae7c13cf9935cd1b01a
- name: memcached_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
- version: e24a3848347b814c7cd60a5a760ffdd947f8a832
+ version: df909d23eac28746933526a806b4b9b6f198ca02
- name: openstack_hosts
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
- version: 17924f5b375c38bc3e7901d0535050e785af0a4e
+ version: cc3b2539c1bf448bb9764c0d6e1775373684e458
- name: os_keystone
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
- version: c6223a9b59fe035c59c1a6e154af3cab2c3407d0
+ version: 50108f68ecc1c7fcde894fdab1b0f682e6179b5a
- name: openstack_openrc
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
- version: 5ebb634a3b353798bbad2e86e0e963b8c75ed879
+ version: 33d59ddb00f27e9a2a3bb816621a55efd1b37ba7
- name: os_aodh
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_aodh
- version: 271174094cf6fc4520b3204b64500fea556be83b
+ version: af239d4a609efd9d2765e6236b9f1c7c1e11acbd
- name: os_barbican
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_barbican
- version: c3ecdf093c9b21e1bbcafea3e2407cf1a62766bb
+ version: e17dace015274e729f3dc70f3155feaf2afdaa33
- name: os_ceilometer
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer
- version: 49c51519c4d74e0996120cc952aca8af2e4599a8
+ version: 325c9741c42356a7275015b77fad1fa7136a55e9
- name: os_cinder
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_cinder
- version: 08a6b00dcbb1f0505c03adb81aa9d4bfc7f4be3e
+ version: fb50ae8d6b2c0f79f3b39515c3cb55cc8061de23
- name: os_congress
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_congress
- version: c77967c05f8d1d7c5ec7a43e86bb8ccb020d691f
+ version: a182cf9cbfc8927d19499b49200671bf85396339
- name: os_designate
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_designate
- version: d90a631c358a6234604b3f3de58b73bb19d51f8e
+ version: dbfcbaae7fbac66142398eb05b37210e48d9eed2
- name: os_glance
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_glance
- version: aa8c698d8b10d07b6a4d3472b4b41405fbdc1e72
+ version: f65fcba32a1fda29708f2c21b6df74bb74ef8726
- name: os_gnocchi
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi
- version: d1e6f6cf8a8c891c10ec975ff42d51fc433b4340
+ version: 95e09c8617b12ff6378f51bb95efd43d3e7a174a
- name: os_heat
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_heat
- version: a1c58116d959c214316ec1a5e0e399235ff2fb58
+ version: a549d4fc90087c81db02167eec28c6dd02bdd4b0
- name: os_horizon
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_horizon
- version: 41291565f82d804aeebc15d0e1c0d719e00c37e1
+ version: b9ca21a603345eb4bfe26ad0266d6bcd4a601c00
- name: os_ironic
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_ironic
- version: 1d7dba5d1caded7bd0c1b602f1c71ab5196fd096
+ version: 635b5cd8316e18b8481c06de513f5db7a02917b9
- name: os_magnum
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_magnum
- version: da4c82b94efc50d4702cb37b04f5c1f25c549d09
+ version: 9e08a9f84983344f9183e6602f19d133d63b98de
- name: os_neutron
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_neutron
- version: 337b86d0ad7efc52bdaa43ab6ca142193cfa7ad8
+ version: 63b43b8bba141cc5e73d45b7db6bfb6085139a65
- name: os_nova
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_nova
- version: 6dfafc355e587838dba9176ba16713ea78181ee7
+ version: 16f68b4bbe1b1fd2498dfe36968c5b4dc76d87b9
- name: os_octavia
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_octavia
- version: 80a2f708c4858580773079fd825b5baf210b434a
+ version: 756f755b7141dbba1207635da95fbc66f0513fa4
- name: os_rally
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_rally
- version: 5719333551b8f4aa0357894b818726fe41e87b14
+ version: b362b5fd64ce44cde00e1527a29d505fcc2d5f54
- name: os_sahara
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_sahara
- version: 1487d806a2bbe3d6b15556481f7ed495d67260cf
+ version: 5bf89e2bbd923a2c2854bbe9a7a7ac3e9ea4780b
- name: os_swift
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_swift
- version: e98404fa9a8357e5a3366caad066b0b99a67390a
+ version: d4af3504e8dc85981eb748c63e4b4460a7d8cacc
- name: os_tacker
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_tacker
- version: 366e357b968105f43e95df884fb24d4df0ab1860
+ version: 2abe2230c9419072dbea6af3eb879ec989fd5a32
- name: os_tempest
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
- version: 2a253115c3d0b9762b9f1a12052a6b5fd91ff3ff
+ version: 1d0fa847bfb49eaa259fa7b29f313adbab523371
- name: os_trove
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-os_trove
- version: ea02134d91a0d67e5bc7ee495057e0c814b0ef05
+ version: a5fe568345187cae713c6911de64dd38c9b477dc
- name: plugins
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-plugins
@@ -157,51 +157,51 @@
- name: rabbitmq_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
- version: c75a1745175918b75c91665c2030b416dac923a9
+ version: cbe65114782e0c77bfb168a20043c2e082932059
- name: repo_build
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_build
- version: 20e0162a9f07febe44c0f6a356937e9e6f4faef4
+ version: 8a4f9db4b8524f3388995374dc34e1f206581bc8
- name: repo_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-repo_server
- version: f6c1d64aa5884f862bcc8958c5285eaea21ca67a
+ version: 3e9048136ba2eb88c6b14daef07960a93da53695
- name: rsyslog_client
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client
- version: fcbed2d2e240d807ae8b157c1f3a7cc300eca26b
+ version: 05ba6715240f1191a0d1f364726786ddf8aaaa96
- name: rsyslog_server
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server
- version: 6fccdc3d082be93be9e734ef3bfef724a3d7b7c6
+ version: e4e527e5a86f1e08599ab04b5ef4b20c076aac4e
- name: sshd
scm: git
src: https://github.com/willshersystems/ansible-sshd
- version: v0.6.2
+ version: 9575d16dd453f4d25e304bb226f0388b3fb1032a
- name: bird
scm: git
src: https://github.com/logan2211/ansible-bird
- version: '1.5'
+ version: 0fdb4848b5aca949ffade9be5a2ae254979e673e
- name: etcd
scm: git
src: https://github.com/logan2211/ansible-etcd
- version: '1.3'
+ version: 3933355dfe51477822db517d3c07ad561fb61318
- name: unbound
scm: git
src: https://github.com/logan2211/ansible-unbound
- version: '1.6'
+ version: 3bb7414f46b757e943507b65ca4c9f1080a008b0
- name: resolvconf
scm: git
src: https://github.com/logan2211/ansible-resolvconf
- version: '1.4'
+ version: a2ff5ba59b47f96ddddcb7a3a67de93687c317a6
- name: ceph-ansible
scm: git
src: https://github.com/ceph/ceph-ansible
- version: v3.2.0beta1
+ version: 561ec9203d4c6becdb3ba48db191552a6b31d736
- name: opendaylight
scm: git
src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
- version: b5613b96f2879590b5fe0e16886198b3fc809599
+ version: 3201a284e806829aff35c9a5481c3fb9fbfab253
- name: haproxy_endpoints
scm: git
src: https://github.com/logan2211/ansible-haproxy-endpoints
@@ -209,24 +209,24 @@
- name: nspawn_container_create
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-nspawn_container_create
- version: 4de3b8e2ac6fe2e47cb9659d841a6c17a42c8756
+ version: 74ceba89a64a44080d198d74169fb547beb8a867
- name: nspawn_hosts
scm: git
src: https://git.openstack.org/openstack/openstack-ansible-nspawn_hosts
- version: 596bbd47bf53677f6589f25f04f7cf7b5c978c87
+ version: 38cdb14ceab21551244ff3f0188bb296dc26fc94
- name: systemd_service
scm: git
src: https://git.openstack.org/openstack/ansible-role-systemd_service
- version: c809a93f0bb10c3a95eb2cd22aba54c4309bdf45
+ version: fcd0651b9d811345bd4c3bffa059ed3c43b7d766
- name: systemd_mount
scm: git
src: https://git.openstack.org/openstack/ansible-role-systemd_mount
- version: b52b1b626739abbebb42ab57f1b316dd71e6a7fb
+ version: 51e06d3e77328c21f0779ee9c8c3203c31ef0b4f
- name: systemd_networkd
scm: git
src: https://git.openstack.org/openstack/ansible-role-systemd_networkd
- version: a70f8b5dfac355c6d517b53eafa0d60052b7f3a5
+ version: 3c1c4e43e36e588e4d6525e82066bcae74f9958f
- name: python_venv_build
scm: git
src: https://git.openstack.org/openstack/ansible-role-python_venv_build
- version: 78ba1a4423571d413be389f5479eca1c3a7fa718
+ version: 716c238f08cfbcf723bf106728c23703229d7ec5
diff --git a/xci/installer/osa/files/openstack_services.yml b/xci/installer/osa/files/openstack_services.yml
index 7c2f0ab0..a05f96e0 100644
--- a/xci/installer/osa/files/openstack_services.yml
+++ b/xci/installer/osa/files/openstack_services.yml
@@ -31,127 +31,131 @@
## Global Requirements
requirements_git_repo: https://git.openstack.org/openstack/requirements
-requirements_git_install_branch: f629a2e6f17f2d666d4fe578e6c19518e1e9c0f4 # HEAD of "master" as of 03.07.2018
+requirements_git_install_branch: 1d9d01339b8919982c031a982a38914bb074cc70 # HEAD of "stable/rocky" as of 27.08.2018
## Aodh service
aodh_git_repo: https://git.openstack.org/openstack/aodh
-aodh_git_install_branch: 179c8b798c5403f481ee2dd164f59f7477b82ef1 # HEAD of "master" as of 03.07.2018
+aodh_git_install_branch: 86a19d58cc8003cf34549fb3a64fd3fd356b7ad2 # HEAD of "stable/rocky" as of 27.08.2018
aodh_git_project_group: aodh_all
## Barbican service
barbican_git_repo: https://git.openstack.org/openstack/barbican
-barbican_git_install_branch: 5dea5cec130b59ecfb8d46435cd7eb3212894b4c # HEAD of "master" as of 03.07.2018
+barbican_git_install_branch: 3f6cccae4982e5a8fe1ca5a3fb198e1481a5891c # HEAD of "stable/rocky" as of 27.08.2018
barbican_git_project_group: barbican_all
## Ceilometer service
ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
-ceilometer_git_install_branch: c721cffb01c3903f20aa7d019e62f932208fbcb3 # HEAD of "master" as of 03.07.2018
+ceilometer_git_install_branch: 786f90c314ff89f23ebc1227c800bedbeaec204b # HEAD of "stable/rocky" as of 27.08.2018
ceilometer_git_project_group: ceilometer_all
## Cinder service
cinder_git_repo: https://git.openstack.org/openstack/cinder
-cinder_git_install_branch: 4bc1e5f6a33f66945b5a01e6d5b3d3688ae647d5 # HEAD of "master" as of 03.07.2018
+cinder_git_install_branch: 707b449c47a86dd40f8d264f012061549172389e # HEAD of "stable/rocky" as of 27.08.2018
cinder_git_project_group: cinder_all
## Designate service
designate_git_repo: https://git.openstack.org/openstack/designate
-designate_git_install_branch: fa9ae37ca7c369ee0af4ac300ab1acc06e0efb10 # HEAD of "master" as of 03.07.2018
+designate_git_install_branch: 3a33ca85eafc5310afe6578f7c0a1ed8235cd477 # HEAD of "stable/rocky" as of 27.08.2018
designate_git_project_group: designate_all
## Horizon Designate dashboard plugin
designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard
-designate_dashboard_git_install_branch: 5f713170e6926ec92bfbca0f3bbd255b9fd93933 # HEAD of "master" as of 03.07.2018
+designate_dashboard_git_install_branch: 630cc303cfd25458fc0a8bc68b0438e2b3721616 # HEAD of "stable/rocky" as of 27.08.2018
designate_dashboard_git_project_group: horizon_all
## Dragonflow service
+# please update the branch (sha and update the comment) when stable/rocky is branched on this repo.
dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
-dragonflow_git_install_branch: 1d0bb1761d1a5425ef8bb62504351aec02695474 # HEAD of "master" as of 03.07.2018
+dragonflow_git_install_branch: 945b1e368c651ffa3655f42df724d9f13a7b6b96 # FROZEN HEAD of "master" as of 17.08.2018
dragonflow_git_project_group: neutron_all
## Glance service
glance_git_repo: https://git.openstack.org/openstack/glance
-glance_git_install_branch: 9a893e80c2a5ee665487ce73845a88946d65ade4 # HEAD of "master" as of 03.07.2018
+glance_git_install_branch: 488d2e4fccc399234fd62c127c8ece262111fe93 # HEAD of "stable/rocky" as of 27.08.2018
glance_git_project_group: glance_all
## Heat service
heat_git_repo: https://git.openstack.org/openstack/heat
-heat_git_install_branch: 9e463f4af77513980b1fd215d5d2ad3bf7b979f9 # HEAD of "master" as of 03.07.2018
+heat_git_install_branch: 207498dea1e9ca23485511cadbbdda85079e391f # HEAD of "stable/rocky" as of 27.08.2018
heat_git_project_group: heat_all
## Horizon Heat dashboard plugin
+# please update the branch (sha and update the comment) when stable/rocky is branched on this repo.
heat_dashboard_git_repo: https://git.openstack.org/openstack/heat-dashboard
-heat_dashboard_git_install_branch: 9cc6e6112b183b9628181766359aa653b17bddc9 # HEAD of "master" as of 03.07.2018
+heat_dashboard_git_install_branch: bc7f5068bbb6f7974eaffa2d865a859ff0fd0069 # FROZEN HEAD of "master" as of 17.08.2018
heat_dashboard_git_project_group: horizon_all
## Horizon service
horizon_git_repo: https://git.openstack.org/openstack/horizon
-horizon_git_install_branch: e45811cc52d06e544db71dee60a4e68f7824729c # HEAD of "master" as of 03.07.2018
+horizon_git_install_branch: 9ced2fff0449d02bf1a5210c36b8635cc981d79e # HEAD of "stable/rocky" as of 27.08.2018
horizon_git_project_group: horizon_all
## Horizon Ironic dashboard plugin
ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui
-ironic_dashboard_git_install_branch: 4823b8d76345897affa4d874a96aaa6e8b275c14 # HEAD of "master" as of 03.07.2018
+ironic_dashboard_git_install_branch: 36840aaa0da8053d2e4032c060a6a45af224572b # HEAD of "stable/rocky" as of 27.08.2018
ironic_dashboard_git_project_group: horizon_all
## Horizon Magnum dashboard plugin
+# please update the branch (sha and update the comment) when stable/rocky is branched on this repo.
magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
-magnum_dashboard_git_install_branch: afd0cb6c8cc2477bad274b0d7c4635a24f4222b9 # HEAD of "master" as of 03.07.2018
+magnum_dashboard_git_install_branch: cfd93ba5bce986903af3ce113f3ce969390f9d37 # FROZEN HEAD of "master" as of 17.08.2018
magnum_dashboard_git_project_group: horizon_all
## Horizon LBaaS dashboard plugin
neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard
-neutron_lbaas_dashboard_git_install_branch: dde6dfb2eba8eb2f1d9cd61986032b512330b281 # HEAD of "master" as of 03.07.2018
+neutron_lbaas_dashboard_git_install_branch: 0d73ac97ac3fb19d13fc0d0981f005a94cfed224 # HEAD of "stable/rocky" as of 27.08.2018
neutron_lbaas_dashboard_git_project_group: horizon_all
## Horizon FWaaS dashboard plugin
neutron_fwaas_dashboard_git_repo: https://git.openstack.org//openstack/neutron-fwaas-dashboard
-neutron_fwaas_dashboard_git_install_branch: df7e11ff377c85486f44168975269b70fda5a3b2 # HEAD of "master" as of 03.07.2018
+neutron_fwaas_dashboard_git_install_branch: e7d3433fe8b671dd6ede65e81e831a0abe1bc859 # HEAD of "stable/rocky" as of 27.08.2018
neutron_fwaas_dashboard_git_project_group: horizon_all
## Horizon Sahara dashboard plugin
sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard
-sahara_dashboard_git_install_branch: 0c10d0825f0d90505960fa72ffbafc4b8110b08d # HEAD of "master" as of 03.07.2018
+sahara_dashboard_git_install_branch: db8283502a9fe1d3b540dbacf9e607255d81a110 # HEAD of "stable/rocky" as of 27.08.2018
sahara_dashboard_git_project_group: horizon_all
## Keystone service
keystone_git_repo: https://git.openstack.org/openstack/keystone
-keystone_git_install_branch: bc7eeff0dd6cd9329c66c8ef07e5ea63f5356397 # HEAD of "master" as of 03.07.2018
+keystone_git_install_branch: c767e254979c96858a81cc4bbe8d9773d4dd539b # HEAD of "stable/rocky" as of 27.08.2018
keystone_git_project_group: keystone_all
## Neutron service
neutron_git_repo: https://git.openstack.org/openstack/neutron
-neutron_git_install_branch: 878ac9b4633849cafa28d6e2df538d3df5b4ba88 # HEAD of "master" as of 03.07.2018
+neutron_git_install_branch: b6314ea6c3df11c6b27cd39844c53b65be0d9060 # HEAD of "stable/rocky" as of 27.08.2018
neutron_git_project_group: neutron_all
neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
-neutron_lbaas_git_install_branch: fd55125641c9458369842f72e1fc65060468ef5f # HEAD of "master" as of 03.07.2018
+neutron_lbaas_git_install_branch: 594ccd122bb2e4750392d92427fe1b151c269403 # HEAD of "stable/rocky" as of 27.08.2018
neutron_lbaas_git_project_group: neutron_all
neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: 83db537dc68716954d25cf528bb076381563afa1 # HEAD of "master" as of 03.07.2018
+neutron_vpnaas_git_install_branch: 1f7708beb71ad371b47a3ee8e552c4f22d96b272 # HEAD of "stable/rocky" as of 27.08.2018
neutron_vpnaas_git_project_group: neutron_all
neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
-neutron_fwaas_git_install_branch: 4b4db7e98c469bc513ed3d0f3dfd1c4c99271dc6 # HEAD of "master" as of 03.07.2018
+neutron_fwaas_git_install_branch: 7567c42e99b298201b30593699d1e180e5bfa759 # HEAD of "stable/rocky" as of 27.08.2018
neutron_fwaas_git_project_group: neutron_all
neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing
-neutron_dynamic_routing_git_install_branch: 93a8b15840c945a497eb886a16e2dbdd88e76f59 # HEAD of "master" as of 03.07.2018
+neutron_dynamic_routing_git_install_branch: ac63f126c6bd0ab12d6cd80077023c3e5c264e98 # HEAD of "stable/rocky" as of 27.08.2018
neutron_dynamic_routing_git_project_group: neutron_all
+# Networking Calico is following master
networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
-networking_calico_git_install_branch: cc24d10f5af45a1b7b39d8176bd0c7819d52bb9e # HEAD of "master" as of 03.07.2018
+networking_calico_git_install_branch: 501fc98c428b8dd6b9dd7bf6908dbcd7b94ead5c # HEAD of "master" as of 27.08.2018
networking_calico_git_project_group: neutron_all
# ODL is frozen until further notice due to
@@ -160,6 +164,10 @@ networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
networking_odl_git_install_branch: 53ff740b2a78626d5b077278997bdcec6b1b0892 # FROZEN HEAD of "master" as of 31.03.2018
networking_odl_git_project_group: neutron_all
+networking_ovn_git_repo: https://git.openstack.org/openstack/networking-ovn
+networking_ovn_git_install_branch: 44dcb509be15a805e00684cce2fabfc4c5265ad7 # HEAD of "stable/rocky" as of 17.08.2018
+networking_ovn_git_project_group: neutron_all
+
# BGPVPN is frozen until further notice due to
# https://github.com/openstack/networking-bgpvpn/commit/e9a0ea199b47f76f69545e04bdb4db44869c388b#diff-b4ef698db8ca845e5845c4618278f29a
networking_bgpvpn_git_repo: https://git.openstack.org/openstack/networking-bgpvpn
@@ -167,86 +175,89 @@ networking_bgpvpn_git_install_branch: 3b93ddacd390d92fb144e5660324d4da064ad9a4 #
networking_bgpvpn_git_project_group: neutron_all
networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc
-networking_sfc_git_install_branch: 379fcd5cfcb7a71e7dbbe969da0255bc3ff09a33 # HEAD of "master" as of 03.07.2018
+networking_sfc_git_install_branch: 4c38303620c8a3f38d7261a64ce8532979bf7560 # HEAD of "stable/rocky" as of 27.08.2018
networking_sfc_git_project_group: neutron_all
## Nova service
nova_git_repo: https://git.openstack.org/openstack/nova
-nova_git_install_branch: df5c253b58f82dcca7f59ac34fc8b8b51e824ca4 # HEAD of "master" as of 03.07.2018
+nova_git_install_branch: 5bff489231c16e62f081267a5b433745dba12ded # HEAD of "stable/rocky" as of 27.08.2018
nova_git_project_group: nova_all
## PowerVM Virt Driver
nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm
-nova_powervm_git_install_branch: 4db7cda136bbbc93f1c278c17bdd8b63af3b17d7 # HEAD of "master" as of 03.07.2018
+nova_powervm_git_install_branch: 984b122668161703eee33918d570c61ae9c5b1ca # HEAD of "stable/rocky" as of 27.08.2018
nova_powervm_git_project_group: nova_all
## LXD Virt Driver
+# please update the branch (sha and update the comment) when stable/rocky is branched on this repo.
nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
-nova_lxd_git_install_branch: a02fce0d312fa5c22ea684b54fb29895fcd8267d # HEAD of "master" as of 03.07.2018
+nova_lxd_git_install_branch: bc8d540c95b3209321658000fd74b0e5065a7ee2 # FROZEN HEAD of "master" as of 17.08.2018
nova_lxd_git_project_group: nova_all
## Sahara service
sahara_git_repo: https://git.openstack.org/openstack/sahara
-sahara_git_install_branch: b23abe2f96b591db5f6d8fe1c1f08bbd22c7666d # HEAD of "master" as of 03.07.2018
+sahara_git_install_branch: 7d9483b21c1e45ef4834f3d3d9973d95d181df3c # HEAD of "stable/rocky" as of 27.08.2018
sahara_git_project_group: sahara_all
## Swift service
+# please update the branch (sha and update the comment) when stable/rocky is branched on this repo.
swift_git_repo: https://git.openstack.org/openstack/swift
-swift_git_install_branch: 3378a487339d894d7c751e911132fdd094663da5 # HEAD of "master" as of 03.07.2018
+swift_git_install_branch: cfc4f30d633dd962cd8d38e0f208b867131082fc # FROZEN HEAD of "master" as of 17.08.2018
swift_git_project_group: swift_all
## Swift3 middleware
+# please remove this when swift role is configured without this middleware (and uses swift code only)
swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
-swift_swift3_git_install_branch: 90db5d1510b2a770387961e7bf0fbeae8101ba45 # HEAD of "master" as of 03.07.2018
+swift_swift3_git_install_branch: 90db5d1510b2a770387961e7bf0fbeae8101ba45 # FROZEN HEAD of "master" as of 17.08.2018
swift_swift3_git_project_group: swift_all
## Ironic service
ironic_git_repo: https://git.openstack.org/openstack/ironic
-ironic_git_install_branch: 08e70c45288f1ec8a5ecc661f8bbef91d3b257c6 # HEAD of "master" as of 03.07.2018
+ironic_git_install_branch: 9ceb015a0a1aef961358953839a71dd3be57753e # HEAD of "stable/rocky" as of 27.08.2018
ironic_git_project_group: ironic_all
## Magnum service
magnum_git_repo: https://git.openstack.org/openstack/magnum
-magnum_git_install_branch: efe1fabd378c9e23e5ec6c492ac47b034839b244 # HEAD of "master" as of 03.07.2018
+magnum_git_install_branch: 0dbe6806ed51fdc08e7b118ac10eedd53d365b5b # HEAD of "stable/rocky" as of 27.08.2018
magnum_git_project_group: magnum_all
## Trove service
trove_git_repo: https://git.openstack.org/openstack/trove
-trove_git_install_branch: f025cf78d0e227cbcc8baec3a2d39a61ac4ac6c9 # HEAD of "master" as of 03.07.2018
+trove_git_install_branch: 50a27fafa16918d95eb49b0057b8eaf8593a6357 # HEAD of "stable/rocky" as of 27.08.2018
trove_git_project_group: trove_all
## Horizon Trove dashboard plugin
trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard
-trove_dashboard_git_install_branch: 06d17bc5fb683823326c81aeb2056a81af19d084 # HEAD of "master" as of 03.07.2018
+trove_dashboard_git_install_branch: 68dda48e33d54346d529c67b4a3d039ab79a8c4a # HEAD of "stable/rocky" as of 27.08.2018
trove_dashboard_git_project_group: horizon_all
## Octavia service
octavia_git_repo: https://git.openstack.org/openstack/octavia
-octavia_git_install_branch: a52d7c6ef930133efde9d5a22ecca5f26e4cfc92 # HEAD of "master" as of 03.07.2018
+octavia_git_install_branch: 4ba1ee5ee017b06c58c8f92a7977adfb73304ef7 # HEAD of "stable/rocky" as of 27.08.2018
octavia_git_project_group: octavia_all
## Tacker service
tacker_git_repo: https://git.openstack.org/openstack/tacker
-tacker_git_install_branch: 7d0c22524ac8352a50af2e017eed4b5be28d4c31 # HEAD of "master" as of 03.07.2018
+tacker_git_install_branch: 0779335868b03f328a267794daac6e1817f74136 # HEAD of "stable/rocky" as of 27.08.2018
tacker_git_project_group: tacker_all
## Congress service
congress_git_repo: https://git.openstack.org/openstack/congress
-congress_git_install_branch: 270db006cc6cde99a2ad66ff40e05927ce217d92 # HEAD of "master" as of 03.07.2018
+congress_git_install_branch: 9f2ae72854fbf1c83bb30a37d24303840340f95b # HEAD of "stable/rocky" as of 27.08.2018
congress_git_project_group: congress_all
## Horizon Octavia dashboard plugin
octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard
-octavia_dashboard_git_install_branch: 4f7a5591ae8dd61b25af7f746f20d8f058aa991c # HEAD of "master" as of 03.07.2018
+octavia_dashboard_git_install_branch: 4e013a00b2ffa003bdaee019b3aac3df80fb13bf # HEAD of "stable/rocky" as of 27.08.2018
octavia_dashboard_git_project_group: horizon_all