Merge pull request #4 from stackhpc/small-fixes

Small fixes
This commit is contained in:
w-miller 2018-08-30 14:36:17 +01:00 committed by GitHub
commit d3bc79aac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 5 deletions

View File

@ -15,4 +15,4 @@ installed inside it, Tenks' role dependencies can be installed by
Currently, Tenks does not have a CLI or wrapper. A virtual cluster can be
deployed by configuring the variables defined in `group_vars/*` as necessary,
then calling `ansible-playbook --inventory ansible/inventory deploy.yml`.
then calling `ansible-playbook --inventory ansible/inventory ansible/deploy.yml`.

View File

@ -28,10 +28,10 @@
state: running
enabled: true
become: true
# Return code 127 means the command does not exist. Do this check to avoid
# installing Open vSwitch system-wide if the command already exists as a link
# to a containerised version of OVS.
when: ovs_vsctl_check.rc == 127
# Assume a non-zero return code means the command does not exist. Do this
# check to avoid installing Open vSwitch system-wide if the command already
# exists as a link to a containerised version of OVS.
when: ovs_vsctl_check.rc != 0
- name: Configure physical networks
include_tasks: physical_network.yml

View File

@ -40,6 +40,7 @@
- name: Ensure Open vSwitch bridge exists
openvswitch_bridge:
bridge: "{{ tenks_bridge }}"
become: true
- name: Connect to existing Linux bridge
when: source_type == 'linux_bridge'

View File

@ -1,4 +1,9 @@
---
# List of package dependencies to install.
# TODO: Make platform-independent.
vbmcd_packages:
- gcc
- libvirt-devel
# The path to the virtualenv in which to install Virtual BMC.
vbmcd_virtualenv_path:
# The URL of the upper constraints file to pass to pip when installing Python

View File

@ -1,4 +1,11 @@
---
- name: Ensure package dependencies are installed
package:
name: "{{ item }}"
state: installed
loop: "{{ vbmcd_packages }}"
become: true
- name: Ensure Python requirements are installed
pip:
requirements: "{{ '/'.join([role_path, 'files', 'requirements.txt']) }}"