Merge "Update Searchlight resource_plugin configuration"

ansible/roles/searchlight/templates/searchlight.conf.j2

@@ -52,40 +52,53 @@ memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}
 memcached_servers = {% for host in groups['memcached'] %}{% if orchestration_engine == 'KUBERNETES' %}memcached{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
 
+[resource_plugin:os_cinder_volume]
+enabled = {{ enable_cinder | bool }}
+
+[resource_plugin:os_cinder_snapshot]
+enabled = {{ enable_cinder | bool }}
+
 [resource_plugin:os_designate_zone]
-enabled = False
+enabled = {{ enable_designate | bool }}
 
 [resource_plugin:os_designate_recordset]
-enabled = False
+enabled = {{ enable_designate | bool }}
 
-{% if not enable_swift | bool %}
 [resource_plugin:os_swift_account]
-enabled = False
+enabled = {{ enable_swift | bool }}
 
 [resource_plugin:os_swift_container]
-enabled = False
+enabled = {{ enable_swift | bool }}
 
 [resource_plugin:os_swift_object]
-enabled = False
-{% endif %}
+enabled = {{ enable_swift | bool }}
 
-{% if not enable_nova | bool %}
 [resource_plugin:os_server_nova]
-enabled = False
-{% endif %}
+enabled = {{ enable_nova | bool }}
+
+[resource_plugin:os_nova_hypervisor]
+enabled = {{ enable_nova | bool }}
+
+[resource_plugin:os_nova_flavor]
+enabled = {{ enable_nova | bool }}
+
+[resource_plugin:os_nova_servergroup]
+enabled = {{ enable_nova | bool }}
 
-{% if not enable_glance | bool %}
 [resource_plugin:os_glance_image]
-enabled = False
+enabled = {{ enable_glance | bool }}
 
 [resource_plugin:os_glance_metadef]
-enabled = False
-{% endif %}
+enabled = {{ enable_glance | bool }}
 
-{% if not enable_neutron | bool %}
 [resource_plugin:os_neutron_net]
-enabled = False
+enabled = {{ enable_neutron | bool }}
 
 [resource_plugin:os_neutron_port]
-enabled = False
-{% endif %}
+enabled = {{ enable_neutron | bool }}
+
+[resource_plugin:os_neutron_floatingip]
+enabled = {{ enable_neutron | bool }}
+
+[resource_plugin:os_neutron_security_group]
+enabled = {{ enable_neutron | bool }}