Ensure the pinned versions of components match to the pinned OSA

The versions for the OpenStack services and global requirements
need to be pinned alongside with the OSA SHA1 and the role versions
to ensure we pinned everything.

This change is required for osa-periodic jobs as well since that
job will use sources-branch-updater.sh script and the script updates
these files to ensure things are pinned correctly.

    modified:   ansible-role-requirements.yml
    modified:   global-requirement-pins.txt
    modified:   playbooks/defaults/repo_packages/openstack_services.yml
    modified:   releasenotes/notes/glance-init-config-overrides-d1c8c3dcc50c109a.yaml
    modified:   releasenotes/notes/neutron-init-config-overrides-9d1d2b3b908705ed.yaml
    modified:   releasenotes/notes/trove-init-config-overrides-a78ed428a32adef8.yaml

By doing this change, we do not need to have any
magic to capture updates to those files. Just updating the files
we keep in xci/file folder will be sufficient and they get copied
over during the playbook execution.

Change-Id: Iae0db22574a0368e896132469a8587d1457ce177
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

3 files changed, 240 insertions, 2 deletions

diff --git a/xci/file/global-requirement-pins.txt b/xci/file/global-requirement-pins.txt
new file mode 100644
index 00000000..4c078d0a
--- /dev/null
+++ b/xci/file/global-requirement-pins.txt
@@ -0,0 +1,14 @@
+# This file should only be used to set python package pins that are
+# not present in OpenStack's upper-constraints. Any pins present in
+# this file will override any requirements set in *requirements.txt,
+# upper-constraints and any roles/vars.
+#
+# Use this file with caution!
+#
+###
+### These are pinned to ensure exactly the same behaviour forever!   ###
+### These pins are updated through the sources-branch-updater script ###
+###
+pip==9.0.1
+setuptools==33.1.1
+wheel==0.29.0
diff --git a/xci/file/openstack_services.yml b/xci/file/openstack_services.yml
new file mode 100644
index 00000000..47cf4fff
--- /dev/null
+++ b/xci/file/openstack_services.yml
@@ -0,0 +1,217 @@
+---
+# 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 services 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.
+
+
+### Before this is shipped all of these services should have a tag set as the branch,
+### or have a comment / reason attached to them as to why a tag can not work.
+
+
+## Global Requirements
+requirements_git_repo: https://git.openstack.org/openstack/requirements
+requirements_git_install_branch: f55adf137d516406df83d4188b004b778a9035ce # HEAD of "master" as of 25.08.2017
+
+
+## Aodh service
+aodh_git_repo: https://git.openstack.org/openstack/aodh
+aodh_git_install_branch: fb1678627caba6f0c2af7c42a84408c240d28b08 # HEAD of "master" as of 25.08.2017
+aodh_git_project_group: aodh_all
+
+
+## Barbican service
+barbican_git_repo: https://git.openstack.org/openstack/barbican
+barbican_git_install_branch: 912a6b58e544bd8517933377ac24ed411b6fc40a # HEAD of "master" as of 25.08.2017
+barbican_git_project_group: barbican_all
+
+
+## Ceilometer service
+ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer
+ceilometer_git_install_branch: 2644fc0e0e04bb3222a12a676e34b88e30d8b4ab # HEAD of "master" as of 25.08.2017
+ceilometer_git_project_group: ceilometer_all
+
+
+## Cinder service
+cinder_git_repo: https://git.openstack.org/openstack/cinder
+cinder_git_install_branch: 7c7b95780a2224e21b84a43a09cb7fdcde103a92 # HEAD of "master" as of 25.08.2017
+cinder_git_project_group: cinder_all
+
+
+## Designate service
+designate_git_repo: https://git.openstack.org/openstack/designate
+designate_git_install_branch: e85f89a3a72b3efde921bff71af36400e5855704 # HEAD of "master" as of 25.08.2017
+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: 347e443f5abbe99a20e8f963e1d966f4a81b283b # HEAD of "master" as of 25.08.2017
+designate_dashboard_git_project_group: horizon_all
+
+
+## Dragonflow service
+dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
+dragonflow_git_install_branch: 418763eebf3b57ef472328bdabdee39053dc9a24 # HEAD of "master" as of 25.08.2017
+dragonflow_git_project_group: neutron_all
+
+
+## Glance service
+glance_git_repo: https://git.openstack.org/openstack/glance
+glance_git_install_branch: 715101623fbfc2a23de73f8b9ba483dabe85e110 # HEAD of "master" as of 25.08.2017
+glance_git_project_group: glance_all
+
+
+## Heat service
+heat_git_repo: https://git.openstack.org/openstack/heat
+heat_git_install_branch: da45940245951ecbf172ab53450b76d159602b5e # HEAD of "master" as of 25.08.2017
+heat_git_project_group: heat_all
+
+
+## Horizon service
+horizon_git_repo: https://git.openstack.org/openstack/horizon
+horizon_git_install_branch: 7640903b2b5c91c00bbac1a9aeef6d893f7f14eb # HEAD of "master" as of 25.08.2017
+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: 791eecc71e8e9a5a6c56896d1acb2ae9caf2491f # HEAD of "master" as of 25.08.2017
+ironic_dashboard_git_project_group: horizon_all
+
+## Horizon Magnum dashboard plugin
+magnum_dashboard_git_repo: https://git.openstack.org/openstack/magnum-ui
+magnum_dashboard_git_install_branch: 31ed768f8838803c43c4e6f6d28f770738454544 # HEAD of "master" as of 25.08.2017
+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: af2e607338fb904f562b3c7ef3d2643d2f7526ba # HEAD of "master" as of 25.08.2017
+neutron_lbaas_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: fc2b57b1217805f1cd50e3f6d555b709b9b8028a # HEAD of "master" as of 25.08.2017
+sahara_dashboard_git_project_group: horizon_all
+
+
+## Keystone service
+keystone_git_repo: https://git.openstack.org/openstack/keystone
+keystone_git_install_branch: 2373cfbbf9508a7320e306943b4b420db137bab6 # HEAD of "master" as of 25.08.2017
+keystone_git_project_group: keystone_all
+
+
+## Neutron service
+neutron_git_repo: https://git.openstack.org/openstack/neutron
+neutron_git_install_branch: bd4bae90a54a99b54596a4cd1f7de305cf671711 # HEAD of "master" as of 25.08.2017
+neutron_git_project_group: neutron_all
+
+neutron_lbaas_git_repo: https://git.openstack.org/openstack/neutron-lbaas
+neutron_lbaas_git_install_branch: 7a7079964468c16b95946367eb969f7ce00ea7c0 # HEAD of "master" as of 25.08.2017
+neutron_lbaas_git_project_group: neutron_all
+
+neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas
+neutron_vpnaas_git_install_branch: 8a279b7231fe05548aa67d53ed38cf6bc47dbaad # HEAD of "master" as of 25.08.2017
+neutron_vpnaas_git_project_group: neutron_all
+
+neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas
+neutron_fwaas_git_install_branch: 43cab7462edf020a1db2f2f14f637587592d6cce # HEAD of "master" as of 25.08.2017
+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: 173bcfb8caf2bc9441006f2f4979e9d0cbc0c546 # HEAD of "master" as of 25.08.2017
+neutron_dynamic_routing_git_project_group: neutron_all
+
+networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
+networking_calico_git_install_branch: e794848060e7ab3edf320b1847151de4eb6af142 # HEAD of "master" as of 25.08.2017
+networking_calico_git_project_group: neutron_all
+
+## Nova service
+nova_git_repo: https://git.openstack.org/openstack/nova
+nova_git_install_branch: a99e936ff14c3993df1b3168cf2cdb28dcbe49b2 # HEAD of "master" as of 25.08.2017
+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: b1e053f4ef0eee28acdf01c0476efafa9a57cd34 # HEAD of "master" as of 25.08.2017
+nova_powervm_git_project_group: nova_all
+
+
+## LXD Virt Driver
+nova_lxd_git_repo: https://git.openstack.org/openstack/nova-lxd
+nova_lxd_git_install_branch: e968708f664f9e955cf0c67883f783b92c96f6c7 # HEAD of "master" as of 25.08.2017
+nova_lxd_git_project_group: nova_all
+
+
+## Sahara service
+sahara_git_repo: https://git.openstack.org/openstack/sahara
+sahara_git_install_branch: 1f7c5db057df420634d78b6d7e7fcab3ffbc3b46 # HEAD of "master" as of 25.08.2017
+sahara_git_project_group: sahara_all
+
+
+## Swift service
+swift_git_repo: https://git.openstack.org/openstack/swift
+swift_git_install_branch: 87340e5f29905defbbc76ff17ae3db94befcbfe0 # HEAD of "master" as of 25.08.2017
+swift_git_project_group: swift_all
+
+
+## Swift3 middleware
+swift_swift3_git_repo: https://git.openstack.org/openstack/swift3
+swift_swift3_git_install_branch: b4c2590ade19475458e24dabc2729ed3bbb22242 # HEAD of "master" as of 25.08.2017
+swift_swift3_git_project_group: swift_all
+
+
+## Ironic service
+ironic_git_repo: https://git.openstack.org/openstack/ironic
+ironic_git_install_branch: bb33d6ed49ee573ad8c83edff52181496ebc23d9 # HEAD of "master" as of 25.08.2017
+ironic_git_project_group: ironic_all
+
+## Magnum service
+magnum_git_repo: https://git.openstack.org/openstack/magnum
+magnum_git_install_branch: 5f84cf8fbb0fe5dc7759d43cafac30ad6d79fa7d # HEAD of "master" as of 25.08.2017
+magnum_git_project_group: magnum_all
+
+## Trove service
+trove_git_repo: https://git.openstack.org/openstack/trove
+trove_git_install_branch: 0fb67d459baa0fb22391b1b1da3dba5349666bb7 # HEAD of "master" as of 25.08.2017
+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: 387c3358555ee539f7abbbf4875497497e12c265 # HEAD of "master" as of 25.08.2017
+trove_dashboard_git_project_group: horizon_all
+
+## Octavia service
+octavia_git_repo: https://git.openstack.org/openstack/octavia
+octavia_git_install_branch: 6c1d424776695a9f83036024cfd459c9a3e25b99 # HEAD of "master" as of 25.08.2017
+octavia_git_project_group: octavia_all
+
+## Molteniron service
+molteniron_git_repo: https://git.openstack.org/openstack/molteniron
+molteniron_git_install_branch: 094276cda77d814d07ad885e7d63de8d1243750a # HEAD of "master" as of 25.08.2017
+molteniron_git_project_group: molteniron_all
+
+## Tacker service
+tacker_git_repo: https://git.openstack.org/openstack/tacker
+tacker_git_install_branch: 54175b3f18f631f21fb1cb929712823bb3e2b05e # HEAD of "master" as of 25.08.2017
+tacker_git_project_group: tacker_all
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index 7b16c5aa..76f8f06e 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -100,8 +100,15 @@
         replace: '\1haproxy_state: enabled'
     - name: copy OPNFV OpenStack playbook
       shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
-    - name: copy OPNFV role requirements
-      shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/ansible-role-requirements.yml {{OPENSTACK_OSA_PATH}}"
+    - name: copy pinned versions of OSA Roles and global requirements
+      shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/{{ item }} {{OPENSTACK_OSA_PATH}}/{{ item }}"
+      with_items:
+        - "ansible-role-requirements.yml"
+        - "global-requirement-pins.txt"
+      when:
+        - OPENSTACK_OSA_VERSION != "master"
+    - name: copy pinned versions of OpenStack services
+      shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/xci/file/openstack_services.yml {{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
       when:
         - OPENSTACK_OSA_VERSION != "master"
     - name: bootstrap ansible on opnfv host