From 1f3fd7511a06ef3a1ec73522c6448ff966d9c584 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Sat, 26 Sep 2015 11:56:39 -0400 Subject: [PATCH] Install ironicclient after installing the shade library Shade needs to be installed before ironicclient, as ironicclient is a dependency, pip ends up removing the previously installed version when we force the upgrade operation, which may downgrade the library to the released version which may be undesirable. Additionally set the pip install of ironicclient to be latest instead of being present. Depends-On: I23e902c8637e142fba23d71467225d48ee265253 Change-Id: I3b1dca09e95e7a29b9f7e4b0a048aaa46bb2e22e --- .../roles/bifrost-ironic-install/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/roles/bifrost-ironic-install/tasks/main.yml b/playbooks/roles/bifrost-ironic-install/tasks/main.yml index f21450761..062cf5513 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/main.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/main.yml @@ -48,12 +48,6 @@ # here for the time being. - name: "Ensure /opt/stack is present" file: name=/opt/stack state=directory owner=root group=root -- name: "Ironic Client - Install from source if configured to do so." - command: pip install --upgrade --force-reinstall {{ ironicclient_git_folder }} - when: skip_install is not defined and ((ironicclient_source_install is defined and ironicclient_source_install == true) or ci_testing == true) -- name: "Ironic Client - Install from pip" - pip: name=python-ironicclient state=present - 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 and testing | bool != true @@ -69,6 +63,12 @@ - name: "dib-utils - install from pip" pip: name=dib-utils state=present when: skip_install is not defined and create_image_via_dib == true +- name: "Ironic Client - Install from source if configured to do so." + command: pip install --upgrade --force-reinstall {{ ironicclient_git_folder }} + when: skip_install is not defined and ((ironicclient_source_install is defined and ironicclient_source_install == true) or ci_testing == true) +- name: "Ironic Client - Install from pip" + pip: name=python-ironicclient state=latest + when: skip_install is not defined and (ironicclient_source_install is not defined or ironicclient_source_install == false) and (ci_testing == false) - name: "Include diskimage-builder installation" include: dib_install.yml when: create_image_via_dib == true