diff options
| -rwxr-xr-x | xci/config/pinned-versions | 4 | ||||
| -rw-r--r-- | xci/installer/osa/files/ansible-role-requirements.yml | 98 | ||||
| -rw-r--r-- | xci/installer/osa/files/openstack_services.yml | 80 | ||||
| -rw-r--r-- | xci/installer/osa/files/setup-openstack.yml | 1 |
4 files changed, 91 insertions, 92 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 9b42fa8e..c4bedaff 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -35,8 +35,8 @@ export BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-"b29646d0e export BIFROST_IRONIC_INSPECTOR_VERSION=${BIFROST_IRONIC_INSPECTOR_VERSION:-"e89450c44e41ec2ddada7909e63f1edc1aa1afdd"} # HEAD of ironic-inspector-client "stable/rocky" as of 11.10.2018 export BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION:-"cb370b776aa274b0ecfacfb29fa5035670839308"} -# HEAD of osa "stable/rocky" as of 07.09.2018 -export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"ff6161e7f08b8ffe9ff6e0552517ea3f10292cf8"} +# HEAD of osa "stable/rocky" as of 05.10.2018 +export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"cf2b7bab51dd7bc704460f8ff5abe2f0540ed833"} 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 fdc466cc..ccd0542d 100644 --- a/xci/installer/osa/files/ansible-role-requirements.yml +++ b/xci/installer/osa/files/ansible-role-requirements.yml @@ -7,12 +7,12 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -# these versions are based on the osa commit ff6161e7f08b8ffe9ff6e0552517ea3f10292cf8 on 2018-09-05 -# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=ff6161e7f08b8ffe9ff6e0552517ea3f10292cf8 +# these versions are based on the osa commit cf2b7bab51dd7bc704460f8ff5abe2f0540ed833 on 2018-10-01 +# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=cf2b7bab51dd7bc704460f8ff5abe2f0540ed833 - name: ansible-hardening scm: git src: https://git.openstack.org/openstack/ansible-hardening - version: d6d2b22e48f9295522b06bbd6a30b4a7d9168020 + version: 14e6bb6a411b6b03bf258144be66845a5831705c - name: apt_package_pinning scm: git src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning @@ -24,19 +24,19 @@ - name: galera_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_client - version: 680779b74368a0336987d4f956959118db051716 + version: bb1b117722c19b96e27a7a327ee0b4922cd2d729 - name: galera_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_server - version: 256b7350fff2a0aec2a8921a867c63ecb067d230 + version: a429f3cd33da0318d47c2dcf769ff12411b3dff9 - name: ceph_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-ceph_client - version: 54301d205b20ee2fb9615addfd6185b62388ab99 + version: 695b0c92be2a102ab14182ed57750d9b81196183 - name: haproxy_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server - version: 3dfda4ca5df51f80147730b1922f81942348f5f0 + version: 2ee3b090c93258b16de16d2d7ba7fee0a202102c - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived @@ -44,127 +44,127 @@ - name: lxc_container_create scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create - version: 747c2ecab825347700fb54b07d5324952066188c + version: 6e0ada93907aacf4d909bc6a30be1383986e4708 - name: lxc_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts - version: 1c9384fbe90a0d570cd9fc94606804ccc1e9a3d4 + version: e178bd367d164bc724eb35923729ead157172908 - name: memcached_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-memcached_server - version: df909d23eac28746933526a806b4b9b6f198ca02 + version: 5b290d6b3bff76219b806e2acf0424c2f90f0d58 - name: openstack_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts - version: cc3b2539c1bf448bb9764c0d6e1775373684e458 + version: f05e4a66d1854f545d9a029cac06cc5231dfa4a6 - name: os_keystone scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_keystone - version: 50108f68ecc1c7fcde894fdab1b0f682e6179b5a + version: 682fa7f16e2465367cb9830c2572182a551c1dc3 - name: openstack_openrc scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc - version: 6c589d69ea4893c35f2d561aa6a18a30486950e2 + version: afa788b12dac82dcf4bb5a2167fafb000e220cd6 - name: os_aodh scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_aodh - version: af239d4a609efd9d2765e6236b9f1c7c1e11acbd + version: 45bf05e696cb1de6b6e65171f3fea51b5d140cd6 - name: os_barbican scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_barbican - version: 0dbe12c8a4d5296c24edc1c85173fd1338db0cca + version: b16bc2dcae2698cb47ceb931fd81afc852fe3dd2 - name: os_ceilometer scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer - version: 325c9741c42356a7275015b77fad1fa7136a55e9 + version: a2f89a680dd22caad4c53736ea369e8833b8d388 - name: os_cinder scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_cinder - version: fb50ae8d6b2c0f79f3b39515c3cb55cc8061de23 + version: 3ef32d1be0ca2ebaf6812d7c5e79955568a51009 - name: os_congress scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_congress - version: a182cf9cbfc8927d19499b49200671bf85396339 + version: 27f40042963062ba04848bff873b282c979ad989 - name: os_designate scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_designate - version: dbfcbaae7fbac66142398eb05b37210e48d9eed2 + version: 0c350f9113e1523c2c30ebb01d72b050e25960e7 - name: os_glance scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_glance - version: f65fcba32a1fda29708f2c21b6df74bb74ef8726 + version: 021c508d1f415260fb86eea694f35db5c82e0d4f - name: os_gnocchi scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi - version: 95e09c8617b12ff6378f51bb95efd43d3e7a174a + version: f45e4784d34a1aa3f93922b816bffe1754fc60e4 - name: os_heat scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_heat - version: a549d4fc90087c81db02167eec28c6dd02bdd4b0 + version: 0d30203b91b126f1710ccb29c6dbf4dae739e1e7 - name: os_horizon scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_horizon - version: b9ca21a603345eb4bfe26ad0266d6bcd4a601c00 + version: 2c1c365870d38a680b7d55412f8c86a37a41dc8f - name: os_ironic scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ironic - version: 635b5cd8316e18b8481c06de513f5db7a02917b9 + version: d92a6b64d2b62bf869a797bc204810626dd31208 - name: os_magnum scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_magnum - version: 9e08a9f84983344f9183e6602f19d133d63b98de + version: 22aafa124e62aef05f967497dc4bb31182fe2cc3 - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron - version: 3db0b9ee91f6e8b99eb4ada99fa5ed75fd826e62 + version: a8c7e0b506a0c347a363dde3f60077aa0cab5641 - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova - version: 2380b70a2eb88e06af3afbde137bcf6d25dee90a + version: 72e030bf2eb9f1a0f386779b53beaff422a0f632 - name: os_octavia scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_octavia - version: 756f755b7141dbba1207635da95fbc66f0513fa4 + version: 41eb1ff4e231c539e0a3f2590de3f0d605455138 - name: os_rally scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_rally - version: b362b5fd64ce44cde00e1527a29d505fcc2d5f54 + version: 387c6e57ae71d4f3a1fafd63afdfdcb5c5415a32 - name: os_sahara scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_sahara - version: 5bf89e2bbd923a2c2854bbe9a7a7ac3e9ea4780b + version: c58de9acbce5ed2255a8a9bdffdbd91adc6030cd - name: os_swift scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_swift - version: d4af3504e8dc85981eb748c63e4b4460a7d8cacc + version: 102e587140cfd24ea288c875888788289784cfde - name: os_tacker scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_tacker - version: 2abe2230c9419072dbea6af3eb879ec989fd5a32 + version: 68f3093582a504975a25df504ea6aa64a3fc9ec7 - name: os_tempest scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_tempest - version: 1d0fa847bfb49eaa259fa7b29f313adbab523371 + version: 480b13b01afa17182e543955ac6df3d637262fe3 - name: os_trove scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_trove - version: a5fe568345187cae713c6911de64dd38c9b477dc + version: 4166e2a70de037b8657934125a3aa15a227cd294 - name: plugins scm: git src: https://git.openstack.org/openstack/openstack-ansible-plugins - version: cda51825f822f3c5545b7789029e1d2a06b17ec8 + version: 31dba70d842d17573981bc05c112fe68b7c0ae45 - name: rabbitmq_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server - version: cbe65114782e0c77bfb168a20043c2e082932059 + version: 18054836283c0cafe216fb7a44532385f648882c - name: repo_build scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_build - version: 8a4f9db4b8524f3388995374dc34e1f206581bc8 + version: 80fb7f2b83b5ee1f2f9a181198991f0a6b5fcab2 - name: repo_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_server - version: 3e9048136ba2eb88c6b14daef07960a93da53695 + version: fdf5586c3f0e53e2b29e4ef543c42ec844d4b795 - name: rsyslog_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client @@ -172,11 +172,11 @@ - name: rsyslog_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server - version: e4e527e5a86f1e08599ab04b5ef4b20c076aac4e + version: 220957ba33d041a9f2dc55aacc8b207987d2d0c6 - name: sshd scm: git src: https://github.com/willshersystems/ansible-sshd - version: 9575d16dd453f4d25e304bb226f0388b3fb1032a + version: 6f43191418382ed0518f34c166df44de50c44df8 - name: bird scm: git src: https://github.com/logan2211/ansible-bird @@ -188,7 +188,7 @@ - name: unbound scm: git src: https://github.com/logan2211/ansible-unbound - version: 3bb7414f46b757e943507b65ca4c9f1080a008b0 + version: c68c108184700096c4c11f7e71f9366ca752b0a6 - name: resolvconf scm: git src: https://github.com/logan2211/ansible-resolvconf @@ -196,11 +196,11 @@ - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: bf8f589958450ce07ec19d01fb98176ab50ab71f + version: 79bd06ad28d8a078bd95923b230eb8d5b66095b2 - name: opendaylight scm: git src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight - version: 4e7d96224ad2a5d27eb7a3dcbc03a098bc45c809 + version: 12f197969f12c5c368e3a1daa129f339f5e0b62a - name: haproxy_endpoints scm: git src: https://github.com/logan2211/ansible-haproxy-endpoints @@ -208,24 +208,24 @@ - name: nspawn_container_create scm: git src: https://git.openstack.org/openstack/openstack-ansible-nspawn_container_create - version: 74ceba89a64a44080d198d74169fb547beb8a867 + version: 2e9f9e83d1dc34a1f96844c71f44cf5924338935 - name: nspawn_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-nspawn_hosts - version: b9183a5f1ee6463411636946feb155b5eb3271ce + version: 9b136ee6842b9964a47a1b336bdcb61175b4bf07 - name: systemd_service scm: git src: https://git.openstack.org/openstack/ansible-role-systemd_service - version: fcd0651b9d811345bd4c3bffa059ed3c43b7d766 + version: 0916714ef92eff247673e0bbc0bb6aea4c84de86 - name: systemd_mount scm: git src: https://git.openstack.org/openstack/ansible-role-systemd_mount - version: 51e06d3e77328c21f0779ee9c8c3203c31ef0b4f + version: f2331d854e4faa46835277420b61769833eba0ab - name: systemd_networkd scm: git src: https://git.openstack.org/openstack/ansible-role-systemd_networkd - version: 3c1c4e43e36e588e4d6525e82066bcae74f9958f + version: b024d0a3d97caf06b962a1f19450511b108dc5eb - name: python_venv_build scm: git src: https://git.openstack.org/openstack/ansible-role-python_venv_build - version: 9f58362c59c4ef45516be5c1d9341e5cbb36e1b2 + version: 0e195d0833464a704374cbd718bf609013b777dd diff --git a/xci/installer/osa/files/openstack_services.yml b/xci/installer/osa/files/openstack_services.yml index 2c61cdc9..41fbc45f 100644 --- a/xci/installer/osa/files/openstack_services.yml +++ b/xci/installer/osa/files/openstack_services.yml @@ -31,48 +31,48 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: 42aae93777c9d0216dad52995efcb623e5f05555 # HEAD of "stable/rocky" as of 17.08.2018 +requirements_git_install_branch: 1d44f821536a970cd804abe31cba3bcd5188bcb1 # HEAD of "stable/rocky" as of 23.09.2018 requirements_git_track_branch: stable/rocky ## Aodh service aodh_git_repo: https://git.openstack.org/openstack/aodh -aodh_git_install_branch: 86a19d58cc8003cf34549fb3a64fd3fd356b7ad2 # HEAD of "stable/rocky" as of 27.08.2018 +aodh_git_install_branch: ae5e710cd5ade867ebd0e6666bad95f82d130210 # HEAD of "stable/rocky" as of 23.09.2018 aodh_git_project_group: aodh_all aodh_git_track_branch: stable/rocky ## Barbican service barbican_git_repo: https://git.openstack.org/openstack/barbican -barbican_git_install_branch: 3f6cccae4982e5a8fe1ca5a3fb198e1481a5891c # HEAD of "stable/rocky" as of 27.08.2018 +barbican_git_install_branch: 3f6cccae4982e5a8fe1ca5a3fb198e1481a5891c # HEAD of "stable/rocky" as of 23.09.2018 barbican_git_project_group: barbican_all barbican_git_track_branch: stable/rocky ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 786f90c314ff89f23ebc1227c800bedbeaec204b # HEAD of "stable/rocky" as of 27.08.2018 -ceilometer_git_project_group: ceilometer_all +ceilometer_git_install_branch: d4c351fb4b2cbd219141990ed267b096dcbdb25f # HEAD of "stable/rocky" as of 23.09.2018 +ceilometer_git_project_group: all ceilometer_git_track_branch: stable/rocky ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: 707b449c47a86dd40f8d264f012061549172389e # HEAD of "stable/rocky" as of 27.08.2018 +cinder_git_install_branch: c56591a8577dadc4d959e678bdce780aaf09000a # HEAD of "stable/rocky" as of 23.09.2018 cinder_git_project_group: cinder_all cinder_git_track_branch: stable/rocky ## Designate service designate_git_repo: https://git.openstack.org/openstack/designate -designate_git_install_branch: 3a33ca85eafc5310afe6578f7c0a1ed8235cd477 # HEAD of "stable/rocky" as of 27.08.2018 +designate_git_install_branch: 5c1c636c29db4b50a4b5ebf258e3a436bffa9fc8 # HEAD of "stable/rocky" as of 23.09.2018 designate_git_project_group: designate_all designate_git_track_branch: stable/rocky ## Horizon Designate dashboard plugin designate_dashboard_git_repo: https://git.openstack.org/openstack/designate-dashboard -designate_dashboard_git_install_branch: 630cc303cfd25458fc0a8bc68b0438e2b3721616 # HEAD of "stable/rocky" as of 27.08.2018 +designate_dashboard_git_install_branch: faa67c87ad3cd5563da722f13b3adaee5bfe350f # HEAD of "stable/rocky" as of 23.09.2018 designate_dashboard_git_project_group: horizon_all designate_dashboard_git_track_branch: stable/rocky @@ -87,14 +87,14 @@ dragonflow_git_track_branch: None ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 488d2e4fccc399234fd62c127c8ece262111fe93 # HEAD of "stable/rocky" as of 27.08.2018 +glance_git_install_branch: 17f192799686541d156abf73ca88fa605e849f9c # HEAD of "stable/rocky" as of 23.09.2018 glance_git_project_group: glance_all glance_git_track_branch: stable/rocky ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: 207498dea1e9ca23485511cadbbdda85079e391f # HEAD of "stable/rocky" as of 27.08.2018 +heat_git_install_branch: 9c20465dc5a0b51f8d376dc7352b8c878732a261 # HEAD of "stable/rocky" as of 23.09.2018 heat_git_project_group: heat_all heat_git_track_branch: stable/rocky @@ -107,89 +107,87 @@ heat_dashboard_git_track_branch: None ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: 9ced2fff0449d02bf1a5210c36b8635cc981d79e # HEAD of "stable/rocky" as of 27.08.2018 +horizon_git_install_branch: 7cda4df0fca305200825b44630940b56c13218e1 # HEAD of "stable/rocky" as of 23.09.2018 horizon_git_project_group: horizon_all horizon_git_track_branch: stable/rocky ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://git.openstack.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: 36840aaa0da8053d2e4032c060a6a45af224572b # HEAD of "stable/rocky" as of 27.08.2018 +ironic_dashboard_git_install_branch: a41139d0c225459980d04a8df9a1f04561e93fee # HEAD of "stable/rocky" as of 23.09.2018 ironic_dashboard_git_project_group: horizon_all ironic_dashboard_git_track_branch: stable/rocky ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: cfd93ba5bce986903af3ce113f3ce969390f9d37 # HEAD of "stable/rocky" as of 17.08.2018 +magnum_dashboard_git_install_branch: 1ff36614179ef763c44c102552e9b69e9fa1bff2 # HEAD of "stable/rocky" as of 23.09.2018 magnum_dashboard_git_project_group: horizon_all magnum_dashboard_git_track_branch: stable/rocky ## Horizon LBaaS dashboard plugin neutron_lbaas_dashboard_git_repo: https://git.openstack.org/openstack/neutron-lbaas-dashboard -neutron_lbaas_dashboard_git_install_branch: 0d73ac97ac3fb19d13fc0d0981f005a94cfed224 # HEAD of "stable/rocky" as of 27.08.2018 +neutron_lbaas_dashboard_git_install_branch: 509175855c2329d4fc3b41ae830ad9bfbbaf2174 # HEAD of "stable/rocky" as of 23.09.2018 neutron_lbaas_dashboard_git_project_group: horizon_all neutron_lbaas_dashboard_git_track_branch: stable/rocky ## Horizon FWaaS dashboard plugin neutron_fwaas_dashboard_git_repo: https://git.openstack.org//openstack/neutron-fwaas-dashboard -neutron_fwaas_dashboard_git_install_branch: e7d3433fe8b671dd6ede65e81e831a0abe1bc859 # HEAD of "stable/rocky" as of 27.08.2018 +neutron_fwaas_dashboard_git_install_branch: 4adf5599211ef90696da94b2fee3aac730f3b7bc # HEAD of "stable/rocky" as of 23.09.2018 neutron_fwaas_dashboard_git_project_group: horizon_all neutron_fwaas_dashboard_git_track_branch: stable/rocky ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://git.openstack.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: db8283502a9fe1d3b540dbacf9e607255d81a110 # HEAD of "stable/rocky" as of 27.08.2018 +sahara_dashboard_git_install_branch: 6e3f7538ce7779612d8e82b069597c06c2225a77 # HEAD of "stable/rocky" as of 23.09.2018 sahara_dashboard_git_project_group: horizon_all sahara_dashboard_git_track_branch: stable/rocky ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: c767e254979c96858a81cc4bbe8d9773d4dd539b # HEAD of "stable/rocky" as of 27.08.2018 +keystone_git_install_branch: c5930abc5aa06881f28baa697d8d43a1f25157b8 # HEAD of "stable/rocky" as of 23.09.2018 keystone_git_project_group: keystone_all keystone_git_track_branch: stable/rocky ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: b6314ea6c3df11c6b27cd39844c53b65be0d9060 # HEAD of "stable/rocky" as of 27.08.2018 +neutron_git_install_branch: 266d1ada5e362dd0a9c06e34c3bbb8dd466931b9 # HEAD of "stable/rocky" as of 23.09.2018 neutron_git_project_group: neutron_all neutron_git_track_branch: stable/rocky neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: 594ccd122bb2e4750392d92427fe1b151c269403 # HEAD of "stable/rocky" as of 27.08.2018 +neutron_lbaas_git_install_branch: e0cca6ec8815a787fb5a3584839f99a2bf686d26 # HEAD of "stable/rocky" as of 23.09.2018 neutron_lbaas_git_project_group: neutron_all neutron_lbaas_git_track_branch: stable/rocky neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 1f7708beb71ad371b47a3ee8e552c4f22d96b272 # HEAD of "stable/rocky" as of 27.08.2018 +neutron_vpnaas_git_install_branch: ea3a41fe999df5c5f0c18eece416414fa717b045 # HEAD of "stable/rocky" as of 23.09.2018 neutron_vpnaas_git_project_group: neutron_all neutron_vpnaas_git_track_branch: stable/rocky neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: 7567c42e99b298201b30593699d1e180e5bfa759 # HEAD of "stable/rocky" as of 27.08.2018 +neutron_fwaas_git_install_branch: 3c6cfbc489a0bd02f33ae072820ae99e897e1ac7 # HEAD of "stable/rocky" as of 23.09.2018 neutron_fwaas_git_project_group: neutron_all neutron_fwaas_git_track_branch: stable/rocky neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: ac63f126c6bd0ab12d6cd80077023c3e5c264e98 # HEAD of "stable/rocky" as of 27.08.2018 +neutron_dynamic_routing_git_install_branch: 13ef65657a99d93c7434814de5ad06df77591642 # HEAD of "stable/rocky" as of 23.09.2018 neutron_dynamic_routing_git_project_group: neutron_all neutron_dynamic_routing_git_track_branch: stable/rocky # Networking Calico is following master networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico -networking_calico_git_install_branch: 501fc98c428b8dd6b9dd7bf6908dbcd7b94ead5c # HEAD of "master" as of 27.08.2018 +networking_calico_git_install_branch: 501fc98c428b8dd6b9dd7bf6908dbcd7b94ead5c # HEAD of "master" as of 23.09.2018 networking_calico_git_project_group: neutron_all networking_calico_git_track_branch: stable/rocky -# ODL is frozen until further notice due to -# https://github.com/openstack/networking-odl/commit/391c1d89ef2b8133d3aafbe7612c7908be106e73#diff-b4ef698db8ca845e5845c4618278f29a networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl -networking_odl_git_install_branch: 53ff740b2a78626d5b077278997bdcec6b1b0892 # FROZEN HEAD of "stable/rocky" as of 31.03.2018 +networking_odl_git_install_branch: 04412a948b94ad784c361e2eeb12bb060b019ede # HEAD of "stable/rocky" as of 23.09.2018 networking_odl_git_project_group: neutron_all -networking_odl_git_track_branch: None +networking_odl_git_track_branch: stable/rocky 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_install_branch: 09eef8de9906ae9bfbd7a68818199693cf3d1b51 # HEAD of "stable/rocky" as of 23.09.2018 networking_ovn_git_project_group: neutron_all # BGPVPN is frozen until further notice due to @@ -200,21 +198,21 @@ networking_bgpvpn_git_project_group: neutron_all networking_bgpvpn_git_track_branch: None networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc -networking_sfc_git_install_branch: 4c38303620c8a3f38d7261a64ce8532979bf7560 # HEAD of "stable/rocky" as of 27.08.2018 +networking_sfc_git_install_branch: 9a59ab80650897cc53bbf533fb241d77c47966da # HEAD of "stable/rocky" as of 23.09.2018 networking_sfc_git_project_group: neutron_all networking_sfc_git_track_branch: stable/rocky ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: 5bff489231c16e62f081267a5b433745dba12ded # HEAD of "stable/rocky" as of 27.08.2018 +nova_git_install_branch: 03188f7eb9a477654a0521655df171a0e51ec22e # HEAD of "stable/rocky" as of 23.09.2018 nova_git_project_group: nova_all nova_git_track_branch: stable/rocky ## PowerVM Virt Driver nova_powervm_git_repo: https://git.openstack.org/openstack/nova-powervm -nova_powervm_git_install_branch: 984b122668161703eee33918d570c61ae9c5b1ca # HEAD of "stable/rocky" as of 27.08.2018 +nova_powervm_git_install_branch: 984b122668161703eee33918d570c61ae9c5b1ca # HEAD of "stable/rocky" as of 23.09.2018 nova_powervm_git_project_group: nova_all nova_powervm_git_track_branch: stable/rocky @@ -229,14 +227,14 @@ nova_lxd_git_track_branch: None ## Sahara service sahara_git_repo: https://git.openstack.org/openstack/sahara -sahara_git_install_branch: 7d9483b21c1e45ef4834f3d3d9973d95d181df3c # HEAD of "stable/rocky" as of 27.08.2018 +sahara_git_install_branch: 0668acdcf888a3e9fd2ca98a8a4a7fcbcecd6d11 # HEAD of "stable/rocky" as of 23.09.2018 sahara_git_project_group: sahara_all sahara_git_track_branch: stable/rocky ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: cfc4f30d633dd962cd8d38e0f208b867131082fc # HEAD of "stable/rocky" as of 17.08.2018 +swift_git_install_branch: a2161f2f46f77dff4229ebd62012d2ad737e3813 # HEAD of "stable/rocky" as of 23.09.2018 swift_git_project_group: swift_all swift_git_track_branch: stable/rocky @@ -251,52 +249,52 @@ swift_swift3_git_track_branch: None ## Ironic service ironic_git_repo: https://git.openstack.org/openstack/ironic -ironic_git_install_branch: 9ceb015a0a1aef961358953839a71dd3be57753e # HEAD of "stable/rocky" as of 27.08.2018 +ironic_git_install_branch: f1e7f95167946885a9394ace704d5d646630e361 # HEAD of "stable/rocky" as of 23.09.2018 ironic_git_project_group: ironic_all ironic_git_track_branch: stable/rocky ## Magnum service magnum_git_repo: https://git.openstack.org/openstack/magnum -magnum_git_install_branch: 0dbe6806ed51fdc08e7b118ac10eedd53d365b5b # HEAD of "stable/rocky" as of 27.08.2018 +magnum_git_install_branch: 11912d58801bd181cd6105ff2b432e0187751115 # HEAD of "stable/rocky" as of 23.09.2018 magnum_git_project_group: magnum_all magnum_git_track_branch: stable/rocky ## Trove service trove_git_repo: https://git.openstack.org/openstack/trove -trove_git_install_branch: 50a27fafa16918d95eb49b0057b8eaf8593a6357 # HEAD of "stable/rocky" as of 27.08.2018 +trove_git_install_branch: 50a27fafa16918d95eb49b0057b8eaf8593a6357 # HEAD of "stable/rocky" as of 23.09.2018 trove_git_project_group: trove_all trove_git_track_branch: stable/rocky ## Horizon Trove dashboard plugin trove_dashboard_git_repo: https://git.openstack.org/openstack/trove-dashboard -trove_dashboard_git_install_branch: 68dda48e33d54346d529c67b4a3d039ab79a8c4a # HEAD of "stable/rocky" as of 27.08.2018 +trove_dashboard_git_install_branch: 68dda48e33d54346d529c67b4a3d039ab79a8c4a # HEAD of "stable/rocky" as of 23.09.2018 trove_dashboard_git_project_group: horizon_all trove_dashboard_git_track_branch: stable/rocky ## Octavia service octavia_git_repo: https://git.openstack.org/openstack/octavia -octavia_git_install_branch: 4ba1ee5ee017b06c58c8f92a7977adfb73304ef7 # HEAD of "stable/rocky" as of 27.08.2018 +octavia_git_install_branch: 67ca77a9c3688bda14a73f62c9780d3240c0fe52 # HEAD of "stable/rocky" as of 23.09.2018 octavia_git_project_group: octavia_all octavia_git_track_branch: stable/rocky ## Tacker service tacker_git_repo: https://git.openstack.org/openstack/tacker -tacker_git_install_branch: 0779335868b03f328a267794daac6e1817f74136 # HEAD of "stable/rocky" as of 27.08.2018 +tacker_git_install_branch: e8116a03c93faf0eec089d95f37c5f51fc7997e4 # HEAD of "stable/rocky" as of 23.09.2018 tacker_git_project_group: tacker_all tacker_git_track_branch: stable/rocky ## Congress service congress_git_repo: https://git.openstack.org/openstack/congress -congress_git_install_branch: 9f2ae72854fbf1c83bb30a37d24303840340f95b # HEAD of "stable/rocky" as of 27.08.2018 +congress_git_install_branch: 6862ac9f356a5403e1e37050e12f032f661bae96 # HEAD of "stable/rocky" as of 23.09.2018 congress_git_project_group: congress_all congress_git_track_branch: stable/rocky ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://git.openstack.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 4e013a00b2ffa003bdaee019b3aac3df80fb13bf # HEAD of "stable/rocky" as of 27.08.2018 +octavia_dashboard_git_install_branch: 80766f9390492c24de38911d7240c5490c7ef562 # HEAD of "stable/rocky" as of 23.09.2018 octavia_dashboard_git_project_group: horizon_all octavia_dashboard_git_track_branch: stable/rocky diff --git a/xci/installer/osa/files/setup-openstack.yml b/xci/installer/osa/files/setup-openstack.yml index 544a9999..8c20eed2 100644 --- a/xci/installer/osa/files/setup-openstack.yml +++ b/xci/installer/osa/files/setup-openstack.yml @@ -19,6 +19,7 @@ - include: os-nova-install.yml - include: os-neutron-install.yml - include: os-heat-install.yml +- include: os-ceilometer-install.yml - include: os-horizon-install.yml when: not core_openstack | default(False) - include: os-swift-install.yml |