Merge pull request openstack-k8s-operators#354 from slawqo/neutron-sr…

…iov-agent Fix name of the config_src variable in neutron_sriov role
fultonj · Sep 22, 2023 · 594825e · 594825e
2 parents 9aaf8c0 + 1b3a816
commit 594825e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/roles/edpm_neutron_sriov/defaults/main.yml b/roles/edpm_neutron_sriov/defaults/main.yml
@@ -18,6 +18,7 @@
 # All variables intended for modification should be placed in this file.
 
 # All variables within this role should have a prefix of "edpm_neutron_sriov_agent"
+edpm_neutron_sriov_agent_config_src: "/var/lib/openstack/configs/neutron-sriov"
 edpm_neutron_sriov_agent_config_dir: "/var/lib/config-data/ansible-generated/neutron-sriov-agent"
 edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"
 

diff --git a/roles/edpm_neutron_sriov/meta/argument_specs.yml b/roles/edpm_neutron_sriov/meta/argument_specs.yml
@@ -4,6 +4,12 @@ argument_specs:
   main:
     short_description: The main entry point for the edpm_neutron_sriov role.
     options:
+      edpm_neutron_sriov_agent_config_src:
+        default: "/var/lib/openstack/configs/neutron-sriov"
+        description: |
+          The path to the directory containing source of the Neutron SRIOV NIC
+          agent configs.
+        type: str
       edpm_neutron_sriov_agent_config_dir:
         default: "/var/lib/config-data/ansible-generated/neutron-sriov-agent"
         description: |

diff --git a/roles/edpm_neutron_sriov/molecule/default/converge.yml b/roles/edpm_neutron_sriov/molecule/default/converge.yml
@@ -19,4 +19,4 @@
   roles:
     - role: "edpm_neutron_sriov"
       vars:
-        edpm_ovn_config_src: "{{lookup('env', 'MOLECULE_SCENARIO_DIRECTORY')}}/test-data"
+        edpm_neutron_sriov_agent_config_src: "{{lookup('env', 'MOLECULE_SCENARIO_DIRECTORY')}}/test-data"
diff --git a/roles/edpm_neutron_sriov/tasks/configure.yml b/roles/edpm_neutron_sriov/tasks/configure.yml
@@ -32,9 +32,9 @@
       notify:
       - restart neutron-sriov-agent
 
-    - name: discover secrets in {{ edpm_ovn_config_src }}
+    - name: discover secrets in {{ edpm_neutron_sriov_agent_config_src }}
       ansible.builtin.find:
-        paths: "{{ edpm_ovn_config_src }}"
+        paths: "{{ edpm_neutron_sriov_agent_config_src }}"
         file_type: file
         recurse: yes
         patterns: