From ac93b8e2e2a19e53a0effc428ecc569adfa3a160 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 16 May 2018 17:45:21 +0100
Subject: [PATCH] Fix yamllint issues in kolla-openstack role
Change-Id: I01daebb219a7e1c7ac0803db17efc14e3173561d
---
ansible/roles/kolla-openstack/.yamllint | 3 --
.../molecule/enable-everything/molecule.yml | 38 +++++++++----------
.../molecule/enable-everything/prepare.yml | 2 +-
.../roles/kolla-openstack/tasks/config.yml | 6 +--
ansible/roles/kolla-openstack/vars/main.yml | 6 +--
5 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/ansible/roles/kolla-openstack/.yamllint b/ansible/roles/kolla-openstack/.yamllint
index 3a2255e46..a4d53d6c4 100644
--- a/ansible/roles/kolla-openstack/.yamllint
+++ b/ansible/roles/kolla-openstack/.yamllint
@@ -8,6 +8,3 @@ rules:
max-spaces-inside: 1
level: error
line-length: disable
- # NOTE(retr0h): Templates no longer fail this lint rule.
- # Uncomment if running old Molecule templates.
- # truthy: disable
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index 7df698bcd..e15854a23 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -14,36 +14,36 @@ provisioner:
group_vars:
all:
kolla_extra_config_path:
- kolla_enable_ceph: True
+ kolla_enable_ceph: true
kolla_extra_ceph: |
[extra-ceph.conf]
foo=bar
- kolla_enable_cinder: True
+ kolla_enable_cinder: true
kolla_extra_cinder: |
[extra-cinder.conf]
foo=bar
- kolla_enable_designate: True
+ kolla_enable_designate: true
kolla_extra_designate: |
[extra-designate.conf]
foo=bar
- kolla_enable_glance: True
+ kolla_enable_glance: true
kolla_extra_glance: |
[extra-glance.conf]
foo=bar
- kolla_enable_grafana: True
+ kolla_enable_grafana: true
kolla_extra_grafana: |
[extra-grafana.ini]
foo=bar
- kolla_enable_heat: True
+ kolla_enable_heat: true
kolla_extra_heat: |
[extra-heat.conf]
foo=bar
- kolla_enable_horizon: True
- kolla_enable_influxdb: True
+ kolla_enable_horizon: true
+ kolla_enable_influxdb: true
kolla_extra_influxdb: |
[extra-influxdb.conf]
foo=bar
- kolla_enable_ironic: True
+ kolla_enable_ironic: true
kolla_extra_ironic: |
[extra-ironic.conf]
foo=bar
@@ -54,37 +54,37 @@ provisioner:
kolla_inspector_ipa_ramdisk_path: ${MOLECULE_TEMP_PATH:-/tmp}/ironic-agent.initramfs
kolla_extra_ironic_dnsmasq: |
extra=bar
- kolla_enable_kafka: True
+ kolla_enable_kafka: true
kolla_extra_kafka: |
[extra-kafka.server.properties]
foo=bar
- kolla_enable_magnum: True
+ kolla_enable_magnum: true
kolla_extra_magnum: |
[extra-magnum.conf]
foo=bar
- kolla_enable_manila: True
- kolla_enable_murano: True
- kolla_enable_monasca: True
+ kolla_enable_manila: true
+ kolla_enable_murano: true
+ kolla_enable_monasca: true
kolla_extra_murano: |
[extra-murano.conf]
foo=bar
- kolla_enable_neutron: True
+ kolla_enable_neutron: true
kolla_extra_neutron: |
[extra-neutron.conf]
foo=bar
kolla_extra_neutron_ml2: |
[extra-ml2_conf.ini]
foo=bar
- kolla_enable_nova: True
+ kolla_enable_nova: true
kolla_extra_nova: |
[extra-nova.conf]
foo=bar
- kolla_enable_sahara: True
+ kolla_enable_sahara: true
kolla_extra_sahara: |
[extra-sahara.conf]
foo=bar
- kolla_enable_swift: True
- kolla_enable_zookeeper: True
+ kolla_enable_swift: true
+ kolla_enable_zookeeper: true
kolla_extra_zookeeper: |
[extra-zookeeper.cfg]
foo=bar
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml
index b1ed8776d..d78cc6940 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/prepare.yml
@@ -8,7 +8,7 @@
module: file
path: "{{ item | dirname }}"
state: directory
- recurse: True
+ recurse: true
with_items:
- "{{ kolla_inspector_ipa_kernel_path }}"
- "{{ kolla_inspector_ipa_ramdisk_path }}"
diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml
index c30c1bdae..2b2761e97 100644
--- a/ansible/roles/kolla-openstack/tasks/config.yml
+++ b/ansible/roles/kolla-openstack/tasks/config.yml
@@ -67,7 +67,7 @@
find:
path: "{{ item.src }}"
patterns: "{{ item.patterns }}"
- recurse: yes
+ recurse: true
with_items: "{{ kolla_openstack_custom_config }}"
register: find_src_result
@@ -86,7 +86,7 @@
with_subelements:
- "{{ find_src_result.results }}"
- files
- - skip_missing: True
+ - skip_missing: true
when:
- item.0.item.enabled | bool
- item.1.path | basename not in item.0.item.ignore | default([])
@@ -98,7 +98,7 @@
with_subelements:
- "{{ find_dest_result.results }}"
- files
- - skip_missing: True
+ - skip_missing: true
when:
- not item.0.item.enabled or
item.1.path | basename not in src_files
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index db4e02e56..0dcb634d5 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -28,12 +28,12 @@ kolla_openstack_custom_config:
- src: "{{ kolla_extra_config_path }}//fluentd/filter"
dest: "{{ kolla_node_custom_config_path }}/fluentd/filter"
patterns: "*.conf"
- enabled: True
+ enabled: true
# Fluentd outputs.
- src: "{{ kolla_extra_config_path }}/fluentd/output"
dest: "{{ kolla_node_custom_config_path }}/fluentd/output"
patterns: "*.conf"
- enabled: True
+ enabled: true
# Glance.
- src: "{{ kolla_extra_config_path }}/glance"
dest: "{{ kolla_node_custom_config_path }}/glance"
@@ -79,7 +79,7 @@ kolla_openstack_custom_config:
- src: "{{ kolla_extra_config_path }}/keystone"
dest: "{{ kolla_node_custom_config_path }}/keystone"
patterns: "*"
- enabled: True
+ enabled: true
# Magnum.
- src: "{{ kolla_extra_config_path }}/magnum"
dest: "{{ kolla_node_custom_config_path }}/magnum"