Merge "Correct requirements"

playbooks/roles/ironic-install/tasks/main.yml

@@ -44,7 +44,10 @@
   when: skip_install is not defined and (ironicclient_source_install is not defined or ironicclient_source_install == false) and (ci_testing == false)
 - name: "proliantutils - Install from pip"
   pip: name=proliantutils state=present
-  when: skip_install is not defined
+  when: skip_install is not defined and testing | bool != true
+- name: "UcsSdk - Install from pip"
+  pip: name=UcsSdk version=0.8.1.9
+  when: skip_install is not defined and testing | bool != true
 - name: "Shade - Install from source if configured to do so"
   command: pip install --force-reinstall {{ shade_git_folder }}
   when: skip_install is not defined and ((shade_source_install is defined and shade_source_install == true) or ci_testing == true)

playbooks/roles/ironic-install/templates/ironic.conf.j2

@@ -216,7 +216,7 @@ auth_strategy=noauth
 # "ironic.drivers" entrypoint. An example may be found in the
 # developer documentation online. (list value)
 {% if testing %}
-enabled_drivers=agent_ssh,agent_ipmitool,pxe_amt,agent_ilo,agent_ucs
+enabled_drivers=agent_ssh
 {% else %}
 enabled_drivers=agent_ipmitool,pxe_amt,agent_ilo,agent_ucs
 {% endif %}

requirements.txt

@@ -6,4 +6,3 @@ Babel>=1.3
 oslo.config>=1.11.0
 oslo.log>=1.2.0
 six>=1.9.0
-UcsSdK==0.8.1.9