diff options
| -rwxr-xr-x | xci/config/pinned-versions | 8 | ||||
| -rw-r--r-- | xci/file/ansible-role-requirements.yml | 104 | ||||
| -rw-r--r-- | xci/file/setup-openstack.yml | 1 |
3 files changed, 53 insertions, 60 deletions
diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index 1cd33813..e3b49c7d 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -21,7 +21,7 @@ #------------------------------------------------------------------------------- # use releng from master until the development work with the sandbox is complete export OPNFV_RELENG_VERSION="master" -# HEAD of "master" as of 28.03.2017 -export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"2600d546ed7116f5aad81972b0987a269f3c45b4"} -# HEAD of "master" as of 26.03.2017 -export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"baba7b317a5898cd73b4a11c4ce364c7e2d3d77f"} +# HEAD of "master" as of 04.04.2017 +export OPENSTACK_BIFROST_VERSION=${OPENSTACK_BIFROST_VERSION:-"6109f824e5510e794dbf1968c3859e8b6356d280"} +# HEAD of "master" as of 04.04.2017 +export OPENSTACK_OSA_VERSION=${OPENSTACK_OSA_VERSION:-"d9e1330c7ff9d72a604b6b4f3af765f66a01b30e"} diff --git a/xci/file/ansible-role-requirements.yml b/xci/file/ansible-role-requirements.yml index 4faab195..842bcc44 100644 --- a/xci/file/ansible-role-requirements.yml +++ b/xci/file/ansible-role-requirements.yml @@ -7,199 +7,193 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +# these versions are extracted based on the osa commit d9e1330c7ff9d72a604b6b4f3af765f66a01b30e on 04.04.2017 +# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=d9e1330c7ff9d72a604b6b4f3af765f66a01b30e - name: apt_package_pinning scm: git src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning - version: master + version: 364fc9fcd8ff652546c13d9c20ac808bc0e35f66 - name: pip_install scm: git src: https://git.openstack.org/openstack/openstack-ansible-pip_install - version: master + version: 793ae4d01397bd91ebe18e9670e8e27d1ae91960 - name: galera_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_client - version: master + version: c093c13e01826da545bf9a0259e0be441bc1b5e1 - name: galera_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-galera_server - version: master + version: fd0a6b104a32badbe7e7594e2c829261a53bfb11 - name: ceph_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-ceph_client - version: master + version: 9149bfa8e3c4284b656834ba7765ea3aa48bec2e - name: haproxy_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server - version: master + version: 32415ab81c61083ac5a83b65274703e4a5470e5e - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived - version: master + version: 4f7c8eb16e3cbd8c8748f126c1eea73db5c8efe9 - name: lxc_container_create scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create - version: master + version: 097da38126d90cfca36cdc3955aaf658a00db599 - name: lxc_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts - version: master + version: 2931d0c87a1c592ad7f1f2f83cdcf468e8dea932 - name: memcached_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-memcached_server - version: master + version: 58e17aa13ebe7b0aa5da7c00afc75d6716d2720d - name: openstack-ansible-security scm: git src: https://git.openstack.org/openstack/openstack-ansible-security - version: master + version: 9d745ec4fe8ac3e6d6cbb2412abe5196a9d2dad7 - name: openstack_hosts scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts - version: master + version: 2076dfddf418b1bdd64d3782346823902aa996bc - name: os_keystone scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_keystone - version: master + version: cee7a02143a1826479e6444c6fb5f1c2b6074ab7 - name: openstack_openrc scm: git src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc - version: master + version: fb98ad8d7bfe7fba0c964cb061313f1b8767c4b0 - name: os_aodh scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_aodh - version: master + version: 9dcacb8fd6feef02e485f99c83535707ae67876b - name: os_barbican scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_barbican - version: master + version: bb3f39cb2f3c31c6980aa65c8953ff6293b992c0 - name: os_ceilometer scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer - version: master + version: 178ad8245fa019f0610c628c58c377997b011e8a - name: os_cinder scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_cinder - version: master + version: 1321fd39d8f55d1dc3baf91b4194469b349d7dc4 - name: os_glance scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_glance - version: master + version: f39ef212bfa2edff8334bfb632cc463001c77c11 - name: os_gnocchi scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_gnocchi - version: master + version: 318bd76e5e72402e8ff5b372b469c27a9395341b - name: os_heat scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_heat - version: master + version: 07d59ddb757b2d2557fba52ac537803e646e65b4 - name: os_horizon scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_horizon - version: master + version: 69ef49c4f7a42f082f4bcff824d13f57145e2b83 - name: os_ironic scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_ironic - version: master + version: 57e8a0eaaa2159f33e64a1b037180383196919d1 - name: os_magnum scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_magnum - version: master + version: 8329c257dff25686827bd1cc904506d76ad1d12f - name: os_trove scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_trove - version: master + version: b948402c76d6188caa7be376098354cdb850d638 - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron - version: master + version: 2a92a4e1857e7457683aefd87ee5a4e751fc701a - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova - version: master + version: 511963b7921ec7c2db24e8ee1d71a940b0aafae4 - name: os_rally scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_rally - version: master + version: 96153c5b3285d11d00611a03135c9d8f267e0f52 - name: os_sahara scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_sahara - version: master + version: 012d3f3530f878e5143d58380f94d1f514baad04 - name: os_swift scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_swift - version: master + version: d62d6a23ac0b01d0320dbcb6c710dfd5f3cecfdf - name: os_tempest scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_tempest - version: master + version: 9d2bfb09d1ebbc9102329b0d42de33aa321e57b1 - name: plugins scm: git src: https://git.openstack.org/openstack/openstack-ansible-plugins - version: master + version: 3d2e23bb7e1d6775789d7f65ce8a878a7ee1d3c7 - name: rabbitmq_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server - version: master + version: 9b0ce64fe235705e237bc4b476ecc0ad602d67a8 - name: repo_build scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_build - version: master + version: fe3ae20f74a912925d5c78040984957a6d55f9de - name: repo_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-repo_server - version: master + version: 7ea0820e0941282cd5c5cc263e939ffbee54ba52 - name: rsyslog_client scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client - version: master + version: 19615e47137eee46ee92c0308532fe1d2212333c - name: rsyslog_server scm: git src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server - version: master + version: efd7b21798da49802012e390a0ddf7cc38636eeb - name: sshd scm: git src: https://github.com/willshersystems/ansible-sshd - version: master + version: 426e11c4dffeca09fcc4d16103a91e5e65180040 - name: bird scm: git src: https://github.com/logan2211/ansible-bird - version: master + version: 2c4d29560d3617abddf0e63e0c95536364dedd92 - name: etcd scm: git src: https://github.com/logan2211/ansible-etcd - version: master + version: ef63b0c5fd352b61084fd5aca286ee7f3fea932b - name: unbound scm: git src: https://github.com/logan2211/ansible-unbound - version: master + version: 5329d03eb9c15373d648a801563087c576bbfcde - name: resolvconf scm: git src: https://github.com/logan2211/ansible-resolvconf - version: master + version: 3b2b7cf2e900b194829565b351bf32bb63954548 - name: os_designate scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_designate - version: master + version: b7098a6bdea73c869f45a86e0cc78d21b032161e - name: ceph.ceph-common scm: git src: https://github.com/ceph/ansible-ceph-common - version: master + version: ef149767fa9565ec887f0bdb007ff752bd61e5d5 - name: ceph.ceph-docker-common scm: git src: https://github.com/ceph/ansible-ceph-docker-common - version: master + version: ca86fd0ef6d24aa2c750a625acdcb8012c374aa0 - name: ceph-mon scm: git src: https://github.com/ceph/ansible-ceph-mon - version: master + version: c5be4d6056dfe6a482ca3fcc483a6050cc8929a1 - name: ceph-osd scm: git src: https://github.com/ceph/ansible-ceph-osd - version: master -- name: os_octavia - scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_octavia - version: master -- name: os_molteniron - scm: git - src: https://git.openstack.org/openstack/openstack-ansible-os_molteniron - version: master + version: 7bc5a61ceb96e487b7a9fe9643f6dafa6492f2b5 diff --git a/xci/file/setup-openstack.yml b/xci/file/setup-openstack.yml index bd5d5cd9..2ffb907e 100644 --- a/xci/file/setup-openstack.yml +++ b/xci/file/setup-openstack.yml @@ -22,7 +22,6 @@ - include: os-horizon-install.yml - include: os-ceilometer-install.yml - include: os-aodh-install.yml -- include: os-designate-install.yml #NOTE(stevelle) Ensure Gnocchi identities exist before Swift - include: os-gnocchi-install.yml when: |