openstack/bifrost
Code Issues Proposed changes

Merge "Reorder client install order"

Browse Source
This commit is contained in:
Zuul 2018-08-30 10:09:20 +00:00 committed by Gerrit Code Review
commit 0d0cfd908d
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
playbooks/roles/bifrost-ironic-install/tasks/install.yml
View File

@ -38,6 +38,12 @@
- name: "Ensure /opt/stack is present" - name: "Ensure /opt/stack is present"
file: name=/opt/stack state=directory owner=root group=root file: name=/opt/stack state=directory owner=root group=root
- name: "OpenStack Client - Install"
include: pip_install.yml
package=python-openstackclient
extra_args="-c {{ upper_constraints_file }}"
when: skip_install is not defined
- name: "proliantutils - Install from pip" - name: "proliantutils - Install from pip"
include: pip_install.yml include: pip_install.yml
package=proliantutils package=proliantutils
@ -57,17 +63,6 @@
action: "{{ ansible_pkg_mgr }} name={{ iscsi_client_package }} state=present" action: "{{ ansible_pkg_mgr }} name={{ iscsi_client_package }} state=present"
when: skip_install is not defined when: skip_install is not defined
# NOTE(TheJulia): Install openstacksdk since shade wraps to openstacksdk and the
# logic is largely going into openstacksdk as time goes on.
- block:
- name: install openstacksdk from PyPI
command: "{{ hostvars[inventory_hostname].ansible_python.executable }} -m pip install openstacksdk"
when: not (openstacksdk_source_install | default(false) | bool)
- name: install openstacksdk from source
command: "{{ hostvars[inventory_hostname].ansible_python.executable }} -m pip install {{ openstacksdk_git_folder }}"
when: openstacksdk_source_install | default(false) | bool
when: skip_install is not defined
# NOTE(pas-ha) even when install into virtualenv is requested, # NOTE(pas-ha) even when install into virtualenv is requested,
# we need to install shade into system for enroll-dynamic to succeed # we need to install shade into system for enroll-dynamic to succeed
- block: - block:
@ -88,12 +83,6 @@
# as a result. # as a result.
when: skip_install is not defined and install_dib | bool == true when: skip_install is not defined and install_dib | bool == true
- name: "OpenStack Client - Install"
include: pip_install.yml
package=python-openstackclient
extra_args="-c {{ upper_constraints_file }}"
when: skip_install is not defined
- name: "Ironic Client - Install" - name: "Ironic Client - Install"
include: pip_install.yml include: pip_install.yml
package=python-ironicclient package=python-ironicclient
@ -154,3 +143,25 @@
include: staging_install.yml include: staging_install.yml
when: skip_install is not defined and staging_drivers_include | bool == true when: skip_install is not defined and staging_drivers_include | bool == true
# NOTE(pas-ha) even when install into virtualenv is requested,
# we need to install shade into system for enroll-dynamic to succeed
- block:
- name: install shade from PyPI
command: "{{ hostvars[inventory_hostname].ansible_python.executable }} -m pip install shade"
when: not (shade_source_install | default(false) | bool)
- name: install shade from source
command: "{{ hostvars[inventory_hostname].ansible_python.executable }} -m pip install {{ shade_git_folder }}"
when: shade_source_install | default(false) | bool
when: skip_install is not defined
# NOTE(TheJulia): Install openstacksdk since shade wraps to openstacksdk and the
# logic is largely going into openstacksdk as time goes on.
- block:
- name: install openstacksdk from PyPI
command: "{{ hostvars[inventory_hostname].ansible_python.executable }} -m pip install openstacksdk"
when: not (openstacksdk_source_install | default(false) | bool)
- name: install openstacksdk from source
command: "{{ hostvars[inventory_hostname].ansible_python.executable }} -m pip install {{ openstacksdk_git_folder }}"
when: openstacksdk_source_install | default(false) | bool
when: skip_install is not defined