Merge "Move ironic pip install into it's own path"

openstack/openstack-ansible-os_nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2016年10月17日 20:33:48 +00:00

committed by Gerrit Code Review

parent 3283bb9504 34cfe72ead

commit 570ec4c317

3 changed files with 34 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml

View File

@@ -401,6 +401,8 @@ nova_requires_pip_packages:

nova_compute_pip_packages:

- libvirt-python

nova_compute_ironic_pip_packages:

- python-ironicclient

# Common pip packages

3
tasks/nova_compute.yml

View File

@@ -22,6 +22,9 @@

- include:nova_compute_lxd.yml

when:nova_virt_type == 'lxd'

- include:nova_compute_ironic.yml

when:nova_virt_type == 'ironic'

- include:nova_compute_key_populate.yml

- include:nova_compute_key_distribute.yml

29
tasks/nova_compute_ironic.yml Normal file

View File

@@ -0,0 +1,29 @@

---

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

# http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

- name:Install pip packages (venv)

pip:

name:"{{ nova_compute_ironic_pip_packages | join(' ') }}"

state:latest

virtualenv:"{{ nova_bin | dirname }}"

virtualenv_site_packages:"no"

extra_args:"{{ pip_install_options_fact|default('') }}"

register:install_packages

until:install_packages|success

retries:5

delay:2

tags:

- nova-install

- nova-pip-packages