summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-08 12:37:07 +0000
committerMarkos Chandras <mchandras@suse.de>2018-03-10 09:51:01 +0000
commitf76dbbfafcdbc6acf6948f8dee60671211774567 (patch)
tree85f5a6a436d4cfc4eb5453d714440af3250ea7bb
parentdc0fee7c092df7c2c1ff7627e33107969b46c6d2 (diff)
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>
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml2
-rw-r--r--xci/playbooks/prepare-functest.yml3
-rw-r--r--xci/playbooks/roles/prepare-functest/tasks/main.yml1
3 files changed, 6 insertions, 0 deletions
diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 202cf361..2996236b 100644
--- 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 6d5b01c6..a4cb664b 100644
--- 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 e781c4df..2797ce43 100644
--- 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 }}"