openstack/kayobe
Code Issues Proposed changes

Merge "Provide keystone.conf to kolla-ansible by default"

Browse Source
This commit is contained in:
Zuul 2019-07-03 14:19:13 +00:00 committed by Gerrit Code Review
commit 84712dd314
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all/kolla
View File

@ -161,7 +161,7 @@ overcloud_container_image_regex_map:
- regex: keepalived - regex: keepalived
enabled: "{{ kolla_enable_haproxy | bool }}" enabled: "{{ kolla_enable_haproxy | bool }}"
- regex: keystone - regex: keystone
enabled: True enabled: "{{ kolla_enable_keystone | bool }}"
- regex: kibana - regex: kibana
enabled: "{{ kolla_enable_kibana | bool }}" enabled: "{{ kolla_enable_kibana | bool }}"
- regex: kolla-toolbox - regex: kolla-toolbox
@ -356,6 +356,7 @@ kolla_enable_ironic: "yes"
kolla_enable_ironic_ipxe: "no" kolla_enable_ironic_ipxe: "no"
kolla_enable_ironic_neutron_agent: "{{ 'yes' if kolla_enable_neutron | bool and kolla_enable_ironic | bool else 'no' }}" kolla_enable_ironic_neutron_agent: "{{ 'yes' if kolla_enable_neutron | bool and kolla_enable_ironic | bool else 'no' }}"
kolla_enable_kafka: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}" kolla_enable_kafka: "{{ 'yes' if kolla_enable_monasca | bool else 'no' }}"
kolla_enable_keystone: "yes"
kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}" kolla_enable_kibana: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_monasca | bool else 'no' }}"
kolla_enable_magnum: "no" kolla_enable_magnum: "no"
kolla_enable_manila: "no" kolla_enable_manila: "no"

4
ansible/roles/kolla-openstack/molecule/default/tests/test_default.py
View File

@ -29,8 +29,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
'path', 'path',
['fluentd/filter', ['fluentd/filter',
'fluentd/input', 'fluentd/input',
'fluentd/output', 'fluentd/output'])
'keystone'])
def test_service_config_directory(host, path): def test_service_config_directory(host, path):
path = os.path.join('/etc/kolla/config', path) path = os.path.join('/etc/kolla/config', path)
utils.test_directory(host, path) utils.test_directory(host, path)
@ -47,6 +46,7 @@ def test_service_config_directory(host, path):
'horizon', 'horizon',
'ironic', 'ironic',
'kafka', 'kafka',
'keystone',
'magnum', 'magnum',
'manila', 'manila',
'mariadb', 'mariadb',

2
ansible/roles/kolla-openstack/vars/main.yml
View File

@ -104,7 +104,7 @@ kolla_openstack_custom_config:
- src: "{{ kolla_extra_config_path }}/keystone" - src: "{{ kolla_extra_config_path }}/keystone"
dest: "{{ kolla_node_custom_config_path }}/keystone" dest: "{{ kolla_node_custom_config_path }}/keystone"
patterns: "*" patterns: "*"
enabled: true enabled: "{{ kolla_enable_keystone }}"
# Keepalived. # Keepalived.
- src: "{{ kolla_extra_config_path }}/keepalived" - src: "{{ kolla_extra_config_path }}/keepalived"
dest: "{{ kolla_node_custom_config_path }}/keepalived" dest: "{{ kolla_node_custom_config_path }}/keepalived"