aboutsummaryrefslogtreecommitdiffstats
path: root/docker/ansible
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2021-04-15 18:13:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2021-04-15 18:13:31 +0000
commit4de702233e018ad10476db1920ab1c993588a593 (patch)
treec857512e103c12882d3b5da953f6ee6c59cd9d98 /docker/ansible
parent6b9818ec66e4a87b523d6f53e168b16c348881c6 (diff)
parent1dbb2e51028914b1ea31fdfb60c668917f1d9893 (diff)
Merge "[ansible][capabilities] Remove the capabilities template from experimental"HEADmaster
Diffstat (limited to 'docker/ansible')
-rw-r--r--docker/ansible/roles/config_files/tasks/capabilities.yml3
-rw-r--r--docker/ansible/roles/config_files/templates/capabilities.conf.j2 (renamed from docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2)0
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/ansible/roles/config_files/tasks/capabilities.yml b/docker/ansible/roles/config_files/tasks/capabilities.yml
index 55672e8..f57d55d 100644
--- 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
index a422b70..a422b70 100644
--- a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2
+++ b/docker/ansible/roles/config_files/templates/capabilities.conf.j2