From 2f99139da80d4fbd4c71e13656e5fd0ade8f0181 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 31 Mar 2016 23:38:48 +0100 Subject: [PATCH] Set SHA's for Mitaka RC1 This sets all pins for OpenStack-Ansible Mitaka RC1. Change-Id: I9edd36801487aff08356149270b8bc761a3d7880 --- ansible-role-requirements.yml | 62 +++++++++---------- .../repo_packages/openstack_other.yml | 6 +- .../repo_packages/openstack_services.yml | 28 ++++----- playbooks/inventory/group_vars/hosts.yml | 2 +- requirements.txt | 2 +- scripts/scripts-library.sh | 2 +- 6 files changed, 49 insertions(+), 53 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index db717552de..c2a0da7079 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,122 +1,118 @@ - name: apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning scm: git - version: master + version: dc69eda3e1a824c23387b76b5bbc6a87a6813770 - name: pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install scm: git - version: master + version: b66859aad66d7b80e9081e3c30f9c5bad72fa42f - name: pip_lock_down src: https://git.openstack.org/openstack/openstack-ansible-pip_lock_down scm: git - version: master + version: 8e01669a615297a75c8205b649d176d99c58ea2a - name: galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client scm: git - version: master + version: 0361308dbbf38720f9e723de92d70d8fd0e16958 - name: galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server scm: git - version: master + version: a0eda70cf885cfb471c74c241112d7a1dfa7f3d1 - name: keepalived src: https://github.com/evrardjp/ansible-keepalived version: '1.3' - name: lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create scm: git - version: master + version: 5c2a77fc28ca7f8e35c058c243257566b014ad72 - name: lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts scm: git - version: master + version: 48a3423967c42febfa8781b07b84a1d3fe37ac66 - name: memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server scm: git - version: master + version: 589f45d66f27573331be4bfac39057c6b1b60e5c - name: openstack-ansible-security src: https://git.openstack.org/openstack/openstack-ansible-security scm: git - version: master + version: 7e7188c25ff0021172e87eb8216f520db7586296 - name: openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts scm: git - version: master + version: 0dbf59d9b2d684e62f92b213bbcfb2a9e1f0a87d - name: os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone scm: git - version: master + version: 27a9aa3316fbdbd248134e032e1c3b7b5d173cfd - name: openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc scm: git - version: master + version: c9d41d3103b8398e4ef167688444e09164e56095 - name: os_aodh src: https://git.openstack.org/openstack/openstack-ansible-os_aodh scm: git - version: master + version: ecdeb095b47967352896b51cdedd0865fefc456e - name: os_ceilometer src: https://git.openstack.org/openstack/openstack-ansible-os_ceilometer scm: git - version: master + version: b13cdf13430091e3a98a1e4ac4741d98a4c82561 - name: os_cinder src: https://git.openstack.org/openstack/openstack-ansible-os_cinder scm: git - version: master + version: a2662d7f8d08299da0ca9022b70ad3c856155761 - name: os_glance src: https://git.openstack.org/openstack/openstack-ansible-os_glance scm: git - version: master + version: a42fa2656c36b80c40ede5730f969974325d9ed8 - name: os_heat src: https://git.openstack.org/openstack/openstack-ansible-os_heat scm: git - version: master + version: 73b738fb5d4eb092cfd7c9435562969b53823e84 - name: os_horizon src: https://git.openstack.org/openstack/openstack-ansible-os_horizon scm: git - version: master + version: 015ff90a447fb9f19342189123767e00cc20a3f4 - name: os_neutron src: https://git.openstack.org/openstack/openstack-ansible-os_neutron scm: git - version: master + version: 373d75a584c08f0c0804f75f1cba8063fbb2712c - name: os_nova src: https://git.openstack.org/openstack/openstack-ansible-os_nova scm: git - version: master + version: 68df2a859fa9cccdd3e333392b410d693d864b42 - name: os_swift src: https://git.openstack.org/openstack/openstack-ansible-os_swift scm: git - version: master -- name: os_swift_sync - src: https://git.openstack.org/openstack/openstack-ansible-os_swift_sync - scm: git - version: master + version: 2e55d2c98114f9c28d778b6d41d8ed692a7271b3 - name: os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest scm: git - version: master + version: aa464d4cf82a87583465d74e5be23e85c47af8e5 - name: plugins src: https://git.openstack.org/openstack/openstack-ansible-plugins path: /etc/ansible scm: git - version: master + version: f9e6f567ba8221cf810c4f42be87c82a18026d99 - name: rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server scm: git - version: master + version: cadd8ff63548bf3d054de9c4638052630e631922 - name: repo_build src: https://git.openstack.org/openstack/openstack-ansible-repo_build scm: git - version: master + version: b769f0a03b86e3cd6eab158e626fcd5fe411676f - name: repo_server src: https://git.openstack.org/openstack/openstack-ansible-repo_server scm: git - version: master + version: fcd8083f12c49381e0cd9792d572855b1129faff - name: rsyslog_client src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_client scm: git - version: master + version: 2246bd2beec155f55496861a82df50d0cc4418a0 - name: rsyslog_server src: https://git.openstack.org/openstack/openstack-ansible-rsyslog_server scm: git - version: master + version: 1a4ecef5f239965084346daee97ad16108905faa - name: sshd - src: https://github.com/willshersystems/ansible-sshd \ No newline at end of file + src: https://github.com/willshersystems/ansible-sshd diff --git a/playbooks/defaults/repo_packages/openstack_other.yml b/playbooks/defaults/repo_packages/openstack_other.yml index dae40ba3d8..47b0935931 100644 --- a/playbooks/defaults/repo_packages/openstack_other.yml +++ b/playbooks/defaults/repo_packages/openstack_other.yml @@ -27,17 +27,17 @@ ## Tempest service tempest_git_repo: https://git.openstack.org/openstack/tempest -tempest_git_install_branch: fd3088f8992633f6eb005e606d3bb8596fa23d56 # HEAD of "master" as of 23.03.2016 +tempest_git_install_branch: ac94d0640cbcdbccf90d1da343dad0f01539779f # HEAD of "master" as of 01.04.2016 tempest_git_dest: "/opt/tempest_{{ tempest_git_install_branch | replace('/', '_') }}" ## NOVNC from source novncproxy_git_repo: https://github.com/kanaka/novnc -novncproxy_git_install_branch: b403cb92fb8de82d04f305b4f14fa978003890d7 # HEAD of "master" as of 23.03.2016 +novncproxy_git_install_branch: b403cb92fb8de82d04f305b4f14fa978003890d7 # HEAD of "master" as of 01.04.2016 novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}" ## spice-html5 from source spicehtml5_git_repo: https://github.com/SPICE/spice-html5 -spicehtml5_git_install_branch: ab73d009487c8afd4def39b54a422499b4c13c40 # HEAD of "master" as of 23.03.2016 +spicehtml5_git_install_branch: ab73d009487c8afd4def39b54a422499b4c13c40 # HEAD of "master" as of 01.04.2016 spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index 4d9a75a80a..13c4826509 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,77 +31,77 @@ ## Global Requirements requirements_git_repo: https://git.openstack.org/openstack/requirements -requirements_git_install_branch: d371aad12f492315122f2a5ab86db4678dbacfd3 # HEAD of "stable/mitaka" as of 28.03.2016 +requirements_git_install_branch: f13e236e908a92b85378a3129bdbd16c7f921cac # HEAD of "stable/mitaka" as of 31.03.2016 requirements_git_dest: "/opt/requirements_{{ requirements_git_install_branch | replace('/', '_') }}" ## Aodh service aodh_git_repo: https://git.openstack.org/openstack/aodh -aodh_git_install_branch: 235f79f3cdd9b5fb607a06011ead7a3962c91921 # HEAD of "stable/mitaka" as of 28.03.2016 +aodh_git_install_branch: 235f79f3cdd9b5fb607a06011ead7a3962c91921 # HEAD of "stable/mitaka" as of 31.03.2016 aodh_git_dest: "/opt/aodh_{{ aodh_git_install_branch | replace('/', '_') }}" ## Ceilometer service ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer -ceilometer_git_install_branch: 7ee29aae2835c9eb0d1a747db8ba06b56f74082c # HEAD of "stable/mitaka" as of 28.03.2016 +ceilometer_git_install_branch: 1266e56da80dff8a6a5c7c572927679ee68a499c # HEAD of "stable/mitaka" as of 31.03.2016 ceilometer_git_dest: "/opt/ceilometer_{{ceilometer_git_install_branch | replace('/', '_') }}" ## Cinder service cinder_git_repo: https://git.openstack.org/openstack/cinder -cinder_git_install_branch: da28ab66c37fa9c762d7562f68ce5b07f2240a6b # HEAD of "stable/mitaka" as of 28.03.2016 +cinder_git_install_branch: 07a5ea2911c77d42c89c3fadec56846ecb45c8ce # HEAD of "stable/mitaka" as of 31.03.2016 cinder_git_dest: "/opt/cinder_{{ cinder_git_install_branch | replace('/', '_') }}" ## Glance service glance_git_repo: https://git.openstack.org/openstack/glance -glance_git_install_branch: 1cb2bdaf613878ee290c43807d1ab3893bedada2 # HEAD of "stable/mitaka" as of 28.03.2016 +glance_git_install_branch: 02ef2ab8e833df6f46b0a47b19c98b397687f73b # HEAD of "stable/mitaka" as of 31.03.2016 glance_git_dest: "/opt/glance_{{ glance_git_install_branch | replace('/', '_') }}" ## Heat service heat_git_repo: https://git.openstack.org/openstack/heat -heat_git_install_branch: 588e7e385e316d87a21b62be526d7e6ba4bb2ad6 # HEAD of "stable/mitaka" as of 28.03.2016 +heat_git_install_branch: 05dde21891a76bebf92a29df7aa6fe8852fcbafe # HEAD of "stable/mitaka" as of 31.03.2016 heat_git_dest: "/opt/heat_{{ heat_git_install_branch | replace('/', '_') }}" ## Horizon service horizon_git_repo: https://git.openstack.org/openstack/horizon -horizon_git_install_branch: 2143bb60e9a84052ebd54a43b3dfb740b95f338a # HEAD of "stable/mitaka" as of 28.03.2016 +horizon_git_install_branch: 2eb320bd31078e3728b91e4badc597624d0827f8 # HEAD of "stable/mitaka" as of 31.03.2016 horizon_git_dest: "/opt/horizon_{{ horizon_git_install_branch | replace('/', '_') }}" ## Keystone service keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: aa53ad975fdc1a70091b87400c85ff4f1d658d2c # HEAD of "stable/mitaka" as of 28.03.2016 +keystone_git_install_branch: cf1fd9dad7d89d50a10ab204aa487663ea258988 # HEAD of "stable/mitaka" as of 31.03.2016 keystone_git_dest: "/opt/keystone_{{ keystone_git_install_branch | replace('/', '_') }}" ## Neutron service neutron_git_repo: https://git.openstack.org/openstack/neutron -neutron_git_install_branch: 439740e92cdb86d65b703dac95e7095fdf569619 # HEAD of "stable/mitaka" as of 28.03.2016 +neutron_git_install_branch: 3213eb124e40b130e174ac3a91067e2b196788dd # HEAD of "stable/mitaka" as of 31.03.2016 neutron_git_dest: "/opt/neutron_{{ neutron_git_install_branch | replace('/', '_') }}" neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas -neutron_lbaas_git_install_branch: a29a6013ebaf2b9a11ae734f5fa9926d56a4718d # HEAD of "stable/mitaka" as of 28.03.2016 +neutron_lbaas_git_install_branch: 19b18f05037dae4bbbada848aae6421da18ab490 # HEAD of "stable/mitaka" as of 31.03.2016 neutron_lbaas_git_dest: "/opt/neutron_lbaas_{{ neutron_lbaas_git_install_branch | replace('/', '_') }}" neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 10a56ce65329724a460b133328e8c9e6d16706a4 # HEAD of "stable/mitaka" as of 28.03.2016 +neutron_vpnaas_git_install_branch: a1b12601a64a2359b2224fd4406c5db008484700 # HEAD of "stable/mitaka" as of 31.03.2016 neutron_vpnaas_git_dest: "/opt/neutron_vpnaas_{{ neutron_vpnaas_git_install_branch | replace('/', '_') }}" neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas -neutron_fwaas_git_install_branch: c213ddc915353207a1b0cc35d6d10370ca7eaade # HEAD of "stable/mitaka" as of 28.03.2016 +neutron_fwaas_git_install_branch: ab5622891e2b1a7631f97471f55ffb9b5235e5ee # HEAD of "stable/mitaka" as of 31.03.2016 neutron_fwaas_git_dest: "/opt/neutron_fwaas_{{ neutron_fwaas_git_install_branch | replace('/', '_') }}" ## Nova service nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: 803171fe8abc2e466bef11c3bbafdacde87fa1f8 # HEAD of "stable/mitaka" as of 28.03.2016 +nova_git_install_branch: 7105f888ee1f52d2a462fc0ece3130dc0d3d49f5 # HEAD of "stable/mitaka" as of 31.03.2016 nova_git_dest: "/opt/nova_{{ nova_git_install_branch | replace('/', '_') }}" ## Swift service swift_git_repo: https://git.openstack.org/openstack/swift -swift_git_install_branch: dc363cf209e4662ed7ecdb7a49eaef00f0d4daca # HEAD of "stable/mitaka" as of 28.03.2016 +swift_git_install_branch: 7755f5d26a303b5c99b58bd529f74626ec64497f # HEAD of "stable/mitaka" as of 31.03.2016 swift_git_dest: "/opt/swift_{{ swift_git_install_branch | replace('/', '_') }}" diff --git a/playbooks/inventory/group_vars/hosts.yml b/playbooks/inventory/group_vars/hosts.yml index ca5bad8a2c..2450e87a8a 100644 --- a/playbooks/inventory/group_vars/hosts.yml +++ b/playbooks/inventory/group_vars/hosts.yml @@ -65,7 +65,7 @@ pip_links: # These pins are updated through the sources-branch-updater script pip_packages: - pip==8.1.1 - - setuptools==20.3.1 + - setuptools==20.6.7 - wheel==0.29.0 ## Memcached options diff --git a/requirements.txt b/requirements.txt index b3f9ea65c5..0d5fad62ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,5 @@ PyYAML>=3.1.0 # ansible ### These pins are updated through the sources-branch-updater script ### ### pip==8.1.1 -setuptools==20.3.1 +setuptools==20.6.7 wheel==0.29.0 diff --git a/scripts/scripts-library.sh b/scripts/scripts-library.sh index ba93b80840..680a0479a2 100755 --- a/scripts/scripts-library.sh +++ b/scripts/scripts-library.sh @@ -21,7 +21,7 @@ MAX_RETRIES=${MAX_RETRIES:-5} REPORT_DATA=${REPORT_DATA:-""} ANSIBLE_PARAMETERS=${ANSIBLE_PARAMETERS:-""} STARTTIME="${STARTTIME:-$(date +%s)}" -PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.1 setuptools==20.3.1 wheel==0.29.0 '} +PIP_INSTALL_OPTIONS=${PIP_INSTALL_OPTIONS:-'pip==8.1.1 setuptools==20.6.7 wheel==0.29.0 '} # The default SSHD configuration has MaxSessions = 10. If a deployer changes # their SSHD config, then the FORKS may be set to a higher number. We set the