openstack/kayobe
Code Issues Proposed changes

Don't require kolla_api_interface on localhost

Browse Source
This commit is contained in:
Doug Szumski 2018-01-18 16:55:51 +00:00 committed by stack
parent 6213260698
commit 4028652353
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ansible/kolla-ansible.yml
View File

@ -10,6 +10,19 @@
set_fact: set_fact:
kolla_api_interface: "{{ internal_net_name | net_interface | replace('-', '_') }}" kolla_api_interface: "{{ internal_net_name | net_interface | replace('-', '_') }}"
when: internal_net_name in network_interfaces when: internal_net_name in network_interfaces
- name: Validate overcloud host Kolla Ansible network configuration
fail:
msg: >
The Kolla Ansible variable {{ item.var_name }}
({{ item.description }}) is invalid. Value:
"{{ hostvars[inventory_hostname][item.var_name] | default('<undefined>') }}".
when:
- item.required | bool
- hostvars[inventory_hostname][item.var_name] is not defined or not hostvars[inventory_hostname][item.var_name]
with_items:
- var_name: "kolla_api_interface"
description: "API network interface name"
required: True
- name: Ensure Kolla Ansible is configured - name: Ensure Kolla Ansible is configured
hosts: localhost hosts: localhost
@ -63,9 +76,6 @@
- item.required | bool - item.required | bool
- hostvars[inventory_hostname][item.var_name] is not defined or not hostvars[inventory_hostname][item.var_name] - hostvars[inventory_hostname][item.var_name] is not defined or not hostvars[inventory_hostname][item.var_name]
with_items: with_items:
- var_name: "kolla_api_interface"
description: "API network interface name"
required: True
- var_name: "kolla_provision_interface" - var_name: "kolla_provision_interface"
description: "Bare metal provisioning network interface name" description: "Bare metal provisioning network interface name"
required: "{{ kolla_enable_ironic }}" required: "{{ kolla_enable_ironic }}"