Merge changes from topic 'set-proper-constrains'

* changes:
  xci: OSA: Ensure proper constrains are applied to pip installations
  xci: Move functest required packages to the functest role

1 files changed, 8 insertions, 16 deletions

diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index deeab182..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
@@ -103,10 +104,15 @@
     - name: install python Crypto module
       package:
         name: "{{ python_crypto_package_name }}"
-    - name: install PyYAML
+    - name: install opnfv pip required packages
       pip:
-        name: pyyaml
+        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
+        - python-openstackclient
     - name: generate password token
       command: "python pw-token-gen.py --file {{OPENSTACK_OSA_ETC_PATH}}/user_secrets.yml"
       args:
@@ -135,20 +141,6 @@
         content: "{{ xci_ssl_key }}"
         dest: "/etc/ssl/private/xci.key"
       become: true
-    - name: install opnfv required packages
-      package:
-        name: "{{ opnfv_required_packages }}"
-        state: latest
-    # Docker is needed for functest
-    - name: Ensure Docker service is started and enabled
-      service:
-        name: "{{ docker_service_name }}"
-        state: started
-        enabled: yes
-    - name: install opnfv required pip packages
-      pip:
-        name: "{{ opnfv_required_pip }}"
-        state: present
 
 - hosts: localhost
   remote_user: root