xci: OSA: Ensure proper constrains are applied to pip installations

We need to make sure that the pip packages that we install are
compatible with the OSA components.

Change-Id: I87e80dc9b8fb862d9f9039d835b0908f752de3ca
Signed-off-by: Markos Chandras <mchandras@suse.de>

diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 202cf36..2996236 100644 (file)
--- a/xci/installer/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -11,6 +11,7 @@
   remote_user: root
   vars_files:
     - "{{ XCI_PATH }}/xci/var/opnfv.yml"
+    - "{{ XCI_PATH }}/xci/installer/osa/files/openstack_services.yml"
 
   pre_tasks:
     - name: Load distribution variables
@@ -107,6 +108,7 @@
       pip:
         name: "{{ item }}"
         state: present
+        extra_args: '-c https://raw.githubusercontent.com/openstack/requirements/{{ requirements_git_install_branch }}/upper-constraints.txt'
       with_items:
         - pyyaml
         - python-neutronclient

diff --git a/xci/playbooks/prepare-functest.yml b/xci/playbooks/prepare-functest.yml
index 6d5b01c..a4cb664 100644 (file)
--- a/xci/playbooks/prepare-functest.yml
+++ b/xci/playbooks/prepare-functest.yml
@@ -16,5 +16,8 @@
 - name: Prepare the environment for functest
   hosts: opnfv
   user: root
+  vars_files:
+    - ../var/opnfv.yml
+    - ../installer/osa/files/openstack_services.yml
   roles:
     - role: "prepare-functest"

diff --git a/xci/playbooks/roles/prepare-functest/tasks/main.yml b/xci/playbooks/roles/prepare-functest/tasks/main.yml
index e781c4d..2797ce4 100644 (file)
--- a/xci/playbooks/roles/prepare-functest/tasks/main.yml
+++ b/xci/playbooks/roles/prepare-functest/tasks/main.yml
@@ -24,6 +24,7 @@
   pip:
    name: "{{ functest_required_pip }}"
    state: present
+   extra_args: '-c https://raw.githubusercontent.com/openstack/requirements/{{ requirements_git_install_branch }}/upper-constraints.txt'
 
 - name: check if the gateway was already set
   shell: "ip a | grep {{ gateway_ip }}"