Merge "[ansible][capabilities] Remove the capabilities template from experimental"

diff --git a/docker/ansible/roles/config_files/tasks/capabilities.yml b/docker/ansible/roles/config_files/tasks/capabilities.yml
index 55672e8..f57d55d 100644 (file)
--- a/docker/ansible/roles/config_files/tasks/capabilities.yml
+++ b/docker/ansible/roles/config_files/tasks/capabilities.yml
@@ -15,9 +15,8 @@
 
 - name: enable capabilities plugin
   template:
-    src: experimental/capabilities.conf.j2
+    src: capabilities.conf.j2
     dest: "{{ config_file_dir }}/capabilities.conf"
-  when: flavor|default('stable')|string == 'experimental'
   tags:
     - capabilities
 

diff --git a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 b/docker/ansible/roles/config_files/templates/capabilities.conf.j2
similarity index 100%
rename from docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2
rename to docker/ansible/roles/config_files/templates/capabilities.conf.j2