Merge pull request #451 from rebtoor/neutron_metadata_production_profile

Make `edpm_neutron_metadata` role compliant with ansible-lint `production` profile
openstack-k8s-operators · Oct 16, 2023 · b273c29 · b273c29
2 parents e8d6974 + b872f95
commit b273c29
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/playbooks/neutron_metadata.yaml b/playbooks/neutron_metadata.yaml
@@ -5,7 +5,7 @@
   become: true
   tasks:
     - name: Neutron OVN Metadata agent
-      import_role:
+      ansible.builtin.import_role:
         name: osp.edpm.edpm_neutron_metadata
       tags:
         - edpm_neutron_metadata
diff --git a/roles/edpm_neutron_metadata/defaults/main.yml b/roles/edpm_neutron_metadata/defaults/main.yml
@@ -22,8 +22,8 @@ edpm_neutron_metadata_common_volumes:
 
 # Neutron conf
 # DEFAULT
-edpm_neutron_metadata_agent_DEFAULT_host: '{{ ansible_facts["nodename"] }}' # also in missing vars
-#edpm_ovn_metadata_agent_DEFAULT_: ''
+edpm_neutron_metadata_agent_DEFAULT_host: '{{ ansible_facts["nodename"] }}'  # also in missing vars
+# edpm_ovn_metadata_agent_DEFAULT_: ''
 # oslo_concurrency
 edpm_neutron_metadata_agent_oslo_concurrency_lock_patch: '$state_path/lock'
 # agent

diff --git a/roles/edpm_neutron_metadata/meta/argument_specs.yml b/roles/edpm_neutron_metadata/meta/argument_specs.yml
@@ -102,11 +102,11 @@ argument_specs:
         type: str
       edpm_neutron_metadata_common_volumes:
         default:
-        - /run/openvswitch:/run/openvswitch:z
-        - '{{ edpm_neutron_metadata_agent_config_dir }}:/etc/neutron.conf.d:z'
-        - /run/netns:/run/netns:shared
-        - /var/log/containers/neutron:/var/log/neutron:z
-        - /var/lib/kolla/config_files/ovn_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro
+          - /run/openvswitch:/run/openvswitch:z
+          - '{{ edpm_neutron_metadata_agent_config_dir }}:/etc/neutron.conf.d:z'
+          - /run/netns:/run/netns:shared
+          - /var/log/containers/neutron:/var/log/neutron:z
+          - /var/lib/kolla/config_files/ovn_metadata_agent.json:/var/lib/kolla/config_files/config.json:ro
         description: ''
         type: list
       edpm_neutron_metadata_agent_config_dir:

diff --git a/roles/edpm_neutron_metadata/tasks/configure.yml b/roles/edpm_neutron_metadata/tasks/configure.yml
@@ -23,16 +23,16 @@
         setype: "container_file_t"
         mode: "0644"
       loop:
-      - {"src": "rootwrap.conf.j2", "dest": "01-rootwrap.conf"}
-      - {"src": "neutron-ovn-metadata-agent.conf.j2", "dest": "01-neutron-ovn-metadata-agent.conf"}
+        - {"src": "rootwrap.conf.j2", "dest": "01-rootwrap.conf"}
+        - {"src": "neutron-ovn-metadata-agent.conf.j2", "dest": "01-neutron-ovn-metadata-agent.conf"}
 
     - name: Discover secrets in {{ edpm_neutron_metadata_config_src }}
       ansible.builtin.find:
         paths: "{{ edpm_neutron_metadata_config_src }}"
         file_type: file
-        recurse: yes
+        recurse: true
         patterns:
-        - "*metadata*conf"
+          - "*metadata*conf"
       register: edpm_neutron_metadata_secrets
       delegate_to: localhost
       become: false