Pin ansible <2.10
Fix linting issues and adjust how we test the prep role. Change-Id: If6209c7e1ec4cb45165223ead59d1b97771416d5
This commit is contained in:
parent
8573ba8000
commit
eadb03222b
|
@ -25,9 +25,11 @@ repos:
|
|||
types: [file, yaml]
|
||||
entry: yamllint --strict -f parsable
|
||||
- repo: https://github.com/ansible/ansible-lint
|
||||
rev: v4.1.1a2
|
||||
rev: v4.3.5
|
||||
hooks:
|
||||
- id: ansible-lint
|
||||
additional_dependencies:
|
||||
- 'ansible<2.10'
|
||||
files: \.(yaml|yml)$
|
||||
entry: >-
|
||||
ansible-lint --force-color -v -x "ANSIBLE0006,ANSIBLE0007,ANSIBLE0010,ANSIBLE0012,ANSIBLE0013,ANSIBLE0016"
|
||||
|
|
|
@ -1 +1 @@
|
|||
ansible>=2.8
|
||||
ansible>=2.8,<2.10
|
||||
|
|
|
@ -49,6 +49,7 @@
|
|||
DnsServers: {{ deploy_dns }}
|
||||
NtpServer: {{ deploy_ntp }}
|
||||
dest: "{{ ansible_env.HOME }}/parameters.yaml"
|
||||
mode: '0644'
|
||||
|
||||
- name: Run overcloud deployment
|
||||
include_role:
|
||||
|
|
|
@ -87,6 +87,7 @@
|
|||
InterfaceLocalMtu: {{ standalone_local_mtu }}
|
||||
NovaComputeLibvirtType: {{ standalone_virt_type }}
|
||||
dest: "{{ ansible_env.HOME }}/parameters.yaml"
|
||||
mode: '0644'
|
||||
|
||||
- name: Generate ContainerImagePrepare
|
||||
include_role:
|
||||
|
|
|
@ -60,6 +60,7 @@
|
|||
src: /usr/share/python-tripleoclient/undercloud.conf.sample
|
||||
dest: "{{ ansible_env.HOME }}/undercloud.conf"
|
||||
remote_src: true
|
||||
mode: '0644'
|
||||
|
||||
- name: Configure undercloud.conf
|
||||
ini_file:
|
||||
|
@ -67,6 +68,7 @@
|
|||
section: "{{ item.section }}"
|
||||
option: "{{ item.option }}"
|
||||
value: "{{ item.value }}"
|
||||
mode: '0644'
|
||||
loop:
|
||||
- {'section': 'DEFAULT', 'option': 'undercloud_debug', 'value': "{{ install_debug }}"}
|
||||
- {'section': 'DEFAULT', 'option': 'local_mtu', 'value': "{{ undercloud_local_mtu }}"}
|
||||
|
|
|
@ -3,10 +3,6 @@
|
|||
hosts: all
|
||||
tasks:
|
||||
|
||||
- name: "Include test_molecule_prep"
|
||||
include_role:
|
||||
name: "test_molecule_prep"
|
||||
|
||||
- name: Test known collection filter
|
||||
set_fact:
|
||||
test_var: "{{ 'test' | tripleo.operator.shell_arg_list(parameter='--test') }}"
|
||||
|
|
|
@ -14,5 +14,6 @@ scenario:
|
|||
name: default
|
||||
test_sequence:
|
||||
- syntax
|
||||
- prepare
|
||||
- converge
|
||||
- verify
|
||||
|
|
|
@ -0,0 +1,8 @@
|
|||
---
|
||||
- name: Prepare
|
||||
hosts: all
|
||||
tasks:
|
||||
|
||||
- name: Include molecule prep
|
||||
include_role:
|
||||
name: test_molecule_prep
|
|
@ -57,6 +57,7 @@
|
|||
file:
|
||||
state: touch
|
||||
path: "{{ tempfile.path }}"
|
||||
mode: '0644'
|
||||
|
||||
- name: Call with skip for existing output file
|
||||
include_role:
|
||||
|
|
|
@ -3,7 +3,7 @@ stestr>=2.0.0 # Apache-2.0
|
|||
oslotest>=3.2.0 # Apache-2.0
|
||||
ruamel.yaml
|
||||
pre-commit # MIT
|
||||
ansible>=2.8
|
||||
ansible>=2.8,<2.10
|
||||
|
||||
# this is required for the docs build jobs
|
||||
sphinx>=2.0.0,!=2.1.0 # BSD
|
||||
|
|
Loading…
Reference in New Issue