Merge pull request #120 from markgoddard/bits-n-bobs

Virtualenv parent dir creation, ansible_user_id, ironic rescue interfaces
This commit is contained in:
Mark Goddard 2018-02-01 10:57:02 +00:00 committed by GitHub
commit 435298b792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 5 deletions

View File

@ -82,6 +82,15 @@ kolla_ironic_enabled_raid_interfaces:
# raid_interface field set. # raid_interface field set.
kolla_ironic_default_raid_interface: no-raid kolla_ironic_default_raid_interface: no-raid
# Specify the list of rescue interfaces to load during service initialization.
kolla_ironic_enabled_rescue_interfaces:
- agent
- no-rescue
# Default rescue interface to be used for nodes that do not have
# rescue_interface field set.
kolla_ironic_default_rescue_interface: no-rescue
# Specify the list of storage interfaces to load during # Specify the list of storage interfaces to load during
# service initialization. # service initialization.
#kolla_ironic_enabled_storage_interfaces: #kolla_ironic_enabled_storage_interfaces:

View File

@ -32,6 +32,15 @@
version: "{{ kolla_ansible_source_version }}" version: "{{ kolla_ansible_source_version }}"
when: kolla_ansible_ctl_install_type == 'source' when: kolla_ansible_ctl_install_type == 'source'
- name: Ensure virtualenv parent directory exists
file:
path: "{{ kolla_ansible_venv | dirname }}"
state: directory
owner: "{{ ansible_user_id }}"
group: "{{ ansible_user_id }}"
become: True
when: kolla_ansible_venv is not none
- name: Ensure the latest version of pip is installed - name: Ensure the latest version of pip is installed
pip: pip:
name: "{{ item.name }}" name: "{{ item.name }}"

View File

@ -124,6 +124,13 @@ kolla_ironic_enabled_raid_interfaces: []
# raid_interface field set. # raid_interface field set.
kolla_ironic_default_raid_interface: kolla_ironic_default_raid_interface:
# Specify the list of rescue interfaces to load during service initialization.
kolla_ironic_enabled_rescue_interfaces: []
# Default rescue interface to be used for nodes that do not have
# rescue_interface field set.
kolla_ironic_default_rescue_interface:
# Specify the list of storage interfaces to load during # Specify the list of storage interfaces to load during
# service initialization. # service initialization.
kolla_ironic_enabled_storage_interfaces: [] kolla_ironic_enabled_storage_interfaces: []

View File

@ -9,7 +9,7 @@ enabled_hardware_types: {{ kolla_ironic_enabled_hardware_types | join(',') }}
{# Add configuration of enabled and default dynamic driver interfaces. #} {# Add configuration of enabled and default dynamic driver interfaces. #}
{% set interfaces=['boot', 'console', 'deploy', 'inspect', 'management', {% set interfaces=['boot', 'console', 'deploy', 'inspect', 'management',
'network', 'power', 'raid', 'storage', 'vendor'] %} 'network', 'power', 'raid', 'rescue', 'storage', 'vendor'] %}
{% for interface in interfaces %} {% for interface in interfaces %}
{% if hostvars[inventory_hostname]['kolla_ironic_enabled_' ~ interface ~ '_interfaces'] | default %} {% if hostvars[inventory_hostname]['kolla_ironic_enabled_' ~ interface ~ '_interfaces'] | default %}
{{ 'enabled_' ~ interface ~ '_interfaces' }} = {{ hostvars[inventory_hostname]['kolla_ironic_enabled_' ~ interface ~ '_interfaces'] | join(',') }} {{ 'enabled_' ~ interface ~ '_interfaces' }} = {{ hostvars[inventory_hostname]['kolla_ironic_enabled_' ~ interface ~ '_interfaces'] | join(',') }}

View File

@ -3,8 +3,8 @@
file: file:
path: "{{ item }}" path: "{{ item }}"
state: directory state: directory
owner: "{{ ansible_user }}" owner: "{{ ansible_user_id }}"
group: "{{ ansible_user }}" group: "{{ ansible_user_id }}"
mode: 0750 mode: 0750
become: True become: True
with_items: with_items:

View File

@ -22,8 +22,8 @@
file: file:
path: "{{ kolla_source_path | dirname }}" path: "{{ kolla_source_path | dirname }}"
state: directory state: directory
owner: "{{ ansible_user }}" owner: "{{ ansible_user_id }}"
group: "{{ ansible_user }}" group: "{{ ansible_user_id }}"
become: True become: True
when: kolla_ctl_install_type == 'source' when: kolla_ctl_install_type == 'source'
@ -34,6 +34,15 @@
version: "{{ kolla_source_version }}" version: "{{ kolla_source_version }}"
when: kolla_ctl_install_type == 'source' when: kolla_ctl_install_type == 'source'
- name: Ensure virtualenv parent directory exists
file:
path: "{{ kolla_venv | dirname }}"
state: directory
owner: "{{ ansible_user_id }}"
group: "{{ ansible_user_id }}"
become: True
when: kolla_venv is not none
- name: Ensure the latest version of pip is installed - name: Ensure the latest version of pip is installed
pip: pip:
name: "{{ item.name }}" name: "{{ item.name }}"

View File

@ -65,6 +65,13 @@
# raid_interface field set. # raid_interface field set.
#kolla_ironic_default_raid_interface: #kolla_ironic_default_raid_interface:
# Specify the list of rescue interfaces to load during service initialization.
#kolla_ironic_enabled_rescue_interfaces:
# Default rescue interface to be used for nodes that do not have
# rescue_interface field set.
#kolla_ironic_default_rescue_interface:
# Specify the list of storage interfaces to load during # Specify the list of storage interfaces to load during
# service initialization. # service initialization.
#kolla_ironic_enabled_storage_interfaces: #kolla_ironic_enabled_storage_interfaces: