summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-06-16 17:52:37 +0200
committerTomas Sedovic <tomas@sedovic.cz>2017-06-16 17:52:37 +0200
commitbf7e5e82872684088995cc55559f8e51fe35d4a9 (patch)
treecbb6bc98f51e9959d45f51d684d4799f7164d02b /roles
parentca93151d4dee1f907cf578e3ab2b565f288c37c8 (diff)
downloadopenshift-bf7e5e82872684088995cc55559f8e51fe35d4a9.tar.gz
openshift-bf7e5e82872684088995cc55559f8e51fe35d4a9.tar.bz2
openshift-bf7e5e82872684088995cc55559f8e51fe35d4a9.tar.xz
openshift-bf7e5e82872684088995cc55559f8e51fe35d4a9.zip
Fix yamllint errors
Diffstat (limited to 'roles')
-rw-r--r--roles/dns-server-detect/tasks/main.yml2
-rw-r--r--roles/hostnames/tasks/main.yaml4
-rw-r--r--roles/hostnames/test/test.yaml17
-rw-r--r--roles/hostnames/vars/records.yaml54
-rw-r--r--roles/openstack-stack/test/stack-create-test.yml1
-rw-r--r--roles/subscription-manager/pre_tasks/pre_tasks.yml4
-rw-r--r--roles/subscription-manager/tasks/main.yml2
7 files changed, 32 insertions, 52 deletions
diff --git a/roles/dns-server-detect/tasks/main.yml b/roles/dns-server-detect/tasks/main.yml
index e8dd0acf0..183c0a0ca 100644
--- a/roles/dns-server-detect/tasks/main.yml
+++ b/roles/dns-server-detect/tasks/main.yml
@@ -1,5 +1,4 @@
---
-
- fail:
msg: 'Missing required private DNS server(s)'
when:
@@ -35,4 +34,3 @@
public_dns_server: "{{ hostvars[groups['dns'][0]].openstack.public_v4 }}"
when:
- public_dns_server is undefined
-
diff --git a/roles/hostnames/tasks/main.yaml b/roles/hostnames/tasks/main.yaml
index bf142d653..c49852210 100644
--- a/roles/hostnames/tasks/main.yaml
+++ b/roles/hostnames/tasks/main.yaml
@@ -15,8 +15,8 @@
register: cloud_cfg
- name: Prevent cloud-init updates of hostname/fqdn (if applicable)
- lineinfile:
- dest: /etc/cloud/cloud.cfg
+ lineinfile:
+ dest: /etc/cloud/cloud.cfg
state: present
regexp: "{{ item.regexp }}"
line: "{{ item.line }}"
diff --git a/roles/hostnames/test/test.yaml b/roles/hostnames/test/test.yaml
index 34bf37942..0c56aea51 100644
--- a/roles/hostnames/test/test.yaml
+++ b/roles/hostnames/test/test.yaml
@@ -2,20 +2,3 @@
- hosts: all
roles:
- role: hostnames
-
-# - debug:
-#
-# - hosts: dns
-# roles:
-# - role: dns-server
-# named_config_views:
-# - name: private
-# acl_entry:
-# - 192.168.124.40/32
-# - 192.168.124.40/32
-# zone:
-# - dns_domain: example.com
-# - name: public
-# zone:
-# - dns_domain: example.com
-# - role: dns
diff --git a/roles/hostnames/vars/records.yaml b/roles/hostnames/vars/records.yaml
index 3bf12ae2b..0cadc8181 100644
--- a/roles/hostnames/vars/records.yaml
+++ b/roles/hostnames/vars/records.yaml
@@ -1,28 +1,28 @@
---
- - name: "Building Records"
- set_fact:
- dns_records_add:
- - view: private
- zone: example.com
- entries:
- - type: A
- hostname: master1.example.com
- ip: 172.16.15.94
- - type: A
- hostname: node1.example.com
- ip: 172.16.15.86
- - type: A
- hostname: node2.example.com
- ip: 172.16.15.87
- - view: public
- zone: example.com
- entries:
- - type: A
- hostname: master1.example.com
- ip: 10.3.10.116
- - type: A
- hostname: node1.example.com
- ip: 10.3.11.46
- - type: A
- hostname: node2.example.com
- ip: 10.3.12.6
+- name: "Building Records"
+ set_fact:
+ dns_records_add:
+ - view: private
+ zone: example.com
+ entries:
+ - type: A
+ hostname: master1.example.com
+ ip: 172.16.15.94
+ - type: A
+ hostname: node1.example.com
+ ip: 172.16.15.86
+ - type: A
+ hostname: node2.example.com
+ ip: 172.16.15.87
+ - view: public
+ zone: example.com
+ entries:
+ - type: A
+ hostname: master1.example.com
+ ip: 10.3.10.116
+ - type: A
+ hostname: node1.example.com
+ ip: 10.3.11.46
+ - type: A
+ hostname: node2.example.com
+ ip: 10.3.12.6
diff --git a/roles/openstack-stack/test/stack-create-test.yml b/roles/openstack-stack/test/stack-create-test.yml
index 6cbd7ff30..0fbf66f34 100644
--- a/roles/openstack-stack/test/stack-create-test.yml
+++ b/roles/openstack-stack/test/stack-create-test.yml
@@ -14,4 +14,3 @@
infra_flavor: "{{ openstack_default_flavor }}"
dns_flavor: "{{ openstack_default_flavor }}"
external_network: "{{ openstack_external_network_name }}"
-
diff --git a/roles/subscription-manager/pre_tasks/pre_tasks.yml b/roles/subscription-manager/pre_tasks/pre_tasks.yml
index b21356cf2..464670fc0 100644
--- a/roles/subscription-manager/pre_tasks/pre_tasks.yml
+++ b/roles/subscription-manager/pre_tasks/pre_tasks.yml
@@ -11,7 +11,7 @@
- name: "Determine if Subscription Manager should be used"
set_fact:
rhsm_register: false
- when:
+ when:
- rhsm_satellite is undefined or rhsm_satellite is none or rhsm_satellite|trim == ''
- rhsm_username is undefined or rhsm_username is none or rhsm_username|trim == ''
- rhsm_password is undefined or rhsm_password is none or rhsm_password|trim == ''
@@ -21,7 +21,7 @@
- name: "Validate Subscription Manager organization is set"
fail: msg="Cannot register to a Satellite server without a value for the Organization via 'rhsm_org'"
- when:
+ when:
- rhsm_org is undefined or rhsm_org is none or rhsm_org|trim == ''
- rhsm_satellite is defined
- rhsm_satellite is not none
diff --git a/roles/subscription-manager/tasks/main.yml b/roles/subscription-manager/tasks/main.yml
index 2dd14b48e..8c1ae697a 100644
--- a/roles/subscription-manager/tasks/main.yml
+++ b/roles/subscription-manager/tasks/main.yml
@@ -4,7 +4,7 @@
rhsm_password: "{{ hostvars.localhost.rhsm_password }}"
when:
- rhsm_password is not defined or rhsm_password is none or rhsm_password|trim == ''
-
+
- name: "Initializing Subscription Manager authentication method"
set_fact:
rhsm_authentication: false