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

ansible/group_vars/all/kolla

@@ -161,7 +161,7 @@ overcloud_container_image_regex_map:
   - regex: keepalived
     enabled: "{{ kolla_enable_haproxy | bool }}"
   - regex: keystone
-    enabled: True
+    enabled: "{{ kolla_enable_keystone | bool }}"
   - regex: kibana
     enabled: "{{ kolla_enable_kibana | bool }}"
   - regex: kolla-toolbox
@@ -356,6 +356,7 @@ kolla_enable_ironic: "yes"
 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_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_magnum: "no"
 kolla_enable_manila: "no"

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

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

ansible/roles/kolla-openstack/vars/main.yml

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