Fix tox-linters job

Change-Id: Iacaa24d6b40dae62dd79e3c02a389022f0d097d5
This commit is contained in:
Eduardo Olivares 2023-01-24 12:31:01 +01:00
parent fae1a9b1ac
commit 9dfaabe613
5 changed files with 58 additions and 58 deletions

View File

@ -2,7 +2,7 @@
repos: repos:
- repo: https://github.com/pre-commit/pre-commit-hooks - repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0 rev: v4.4.0
hooks: hooks:
- id: check-added-large-files - id: check-added-large-files
- id: check-byte-order-marker - id: check-byte-order-marker
@ -19,12 +19,12 @@ repos:
- id: trailing-whitespace - id: trailing-whitespace
- repo: https://github.com/adrienverge/yamllint.git - repo: https://github.com/adrienverge/yamllint.git
rev: v1.27.1 rev: v1.29.0
hooks: hooks:
- id: yamllint - id: yamllint
files: \.(yaml|yml)$ files: \.(yaml|yml)$
- repo: https://opendev.org/openstack/bashate.git - repo: https://opendev.org/openstack/bashate.git
rev: 2.1.0 rev: 2.1.1
hooks: hooks:
- id: bashate - id: bashate

View File

@ -15,6 +15,6 @@
git: git:
repo: '{{ devstack_git_repo }}' repo: '{{ devstack_git_repo }}'
dest: '{{ devstack_dir | realpath }}' dest: '{{ devstack_dir | realpath }}'
update: no update: false
become: true become: true
become_user: stack become_user: stack

View File

@ -1,3 +1,5 @@
---
- name: copy stack.sh file to /etc/profile.d/ - name: copy stack.sh file to /etc/profile.d/
become: true become: true
copy: copy:

View File

@ -2,37 +2,36 @@
- delegate_to: localhost - delegate_to: localhost
block: block:
- name: ensure '{{ tobiko_ssh_config_path | dirname }}' exists
file:
path: '{{ tobiko_ssh_config_path | dirname }}'
state: directory
- name: ensure '{{ tobiko_ssh_config_path | dirname }}' exists - name: get ssh_config content'
file: shell:
path: '{{ tobiko_ssh_config_path | dirname }}' cmd: vagrant ssh-config
state: directory chdir: '{{ devstack_plugin_tobiko_src_dir }}'
register: get_ssh_config
changed_when: false
- name: get ssh_config content' - debug: var=get_ssh_config
shell:
cmd: vagrant ssh-config
chdir: '{{ devstack_plugin_tobiko_src_dir }}'
register: get_ssh_config
changed_when: false
- debug: var=get_ssh_config - name: write ssh_config to file '{{ tobiko_ssh_config_path }}'
copy:
content: |
{{ get_ssh_config.stdout }}
dest: '{{ tobiko_ssh_config_path }}'
- name: write ssh_config to file '{{ tobiko_ssh_config_path }}' - name: write ssh_config file path to {{ tobiko_config_path }}
copy: ini_file:
content: | path: '{{ tobiko_config_path }}'
{{ get_ssh_config.stdout }} section: ssh
dest: '{{ tobiko_ssh_config_path }}' option: config_files
value: '{{ tobiko_ssh_config_path }}'
- name: write ssh_config file path to {{ tobiko_config_path }} - name: write SSH proxy jump host to {{ tobiko_config_path }}
ini_file: ini_file:
path: '{{ tobiko_config_path }}' path: '{{ tobiko_config_path }}'
section: ssh section: ssh
option: config_files option: proxy_jump
value: '{{ tobiko_ssh_config_path }}' value: devstack-primary
- name: write SSH proxy jump host to {{ tobiko_config_path }}
ini_file:
path: '{{ tobiko_config_path }}'
section: ssh
option: proxy_jump
value: devstack-primary

View File

@ -3,30 +3,29 @@
- name: Configure Neutron bridge for multi node setup - name: Configure Neutron bridge for multi node setup
when: "( ansible_play_hosts | length ) > 1" when: "( ansible_play_hosts | length ) > 1"
block: block:
- name: Ensure the infra bridge exists
become: true
openvswitch_bridge:
bridge: "{{ infra_bridge_name }}"
state: present
fail_mode: standalone
- name: Ensure the infra bridge exists - name: Ensure the Neutron external bridge exists
become: true become: true
openvswitch_bridge: openvswitch_bridge:
bridge: "{{ infra_bridge_name }}" bridge: "{{ neutron_external_bridge_name }}"
state: present state: present
fail_mode: standalone fail_mode: standalone
- name: Ensure the Neutron external bridge exists - name: Create patch port between bridges
become: true become: true
openvswitch_bridge: command: >-
bridge: "{{ neutron_external_bridge_name }}" ovs-vsctl
state: present --may-exist add-port {{ infra_bridge_name }}
fail_mode: standalone patch-{{ neutron_external_bridge_name }} --
set interface patch-{{ neutron_external_bridge_name }}
- name: Create patch port between bridges type=patch options:peer=patch-{{ infra_bridge_name }} --
become: true --may-exist add-port {{ neutron_external_bridge_name }}
command: >- patch-{{ infra_bridge_name }} --
ovs-vsctl set interface patch-{{ infra_bridge_name }}
--may-exist add-port {{ infra_bridge_name }} type=patch options:peer=patch-{{ neutron_external_bridge_name }}
patch-{{ neutron_external_bridge_name }} --
set interface patch-{{ neutron_external_bridge_name }}
type=patch options:peer=patch-{{ infra_bridge_name }} --
--may-exist add-port {{ neutron_external_bridge_name }}
patch-{{ infra_bridge_name }} --
set interface patch-{{ infra_bridge_name }}
type=patch options:peer=patch-{{ neutron_external_bridge_name }}