Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix name of the config_src variable in neutron_sriov role #354

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions roles/edpm_neutron_sriov/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 6 additions & 0 deletions roles/edpm_neutron_sriov/meta/argument_specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion roles/edpm_neutron_sriov/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions roles/edpm_neutron_sriov/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down