summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/provisioning/openstack/openstack_dns_records.yml6
-rw-r--r--playbooks/provisioning/openstack/openstack_dns_views.yml6
-rw-r--r--playbooks/provisioning/openstack/post-provision-openstack.yml2
-rw-r--r--playbooks/provisioning/openstack/pre-install.yml2
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/clouds.yaml2
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml1
6 files changed, 6 insertions, 13 deletions
diff --git a/playbooks/provisioning/openstack/openstack_dns_records.yml b/playbooks/provisioning/openstack/openstack_dns_records.yml
index b1008fe33..b32b70ba9 100644
--- a/playbooks/provisioning/openstack/openstack_dns_records.yml
+++ b/playbooks/provisioning/openstack/openstack_dns_records.yml
@@ -1,5 +1,4 @@
---
-
- name: "Generate list of private A records"
set_fact:
private_records: "{{ private_records | default([]) + [ { 'type': 'A', 'hostname': hostvars[item]['ansible_hostname'], 'ip': hostvars[item]['openstack']['private_v4'] } ] }}"
@@ -42,7 +41,7 @@
set_fact:
public_records: "{{ public_records | default([]) + [ { 'type': 'A', 'hostname': '*.' + openshift_app_domain, 'ip': hostvars[item]['openstack']['public_v4'] } ] }}"
with_items: "{{ groups['infra_hosts'] }}"
-
+
- name: "Set the public DNS server details to use the external value (if provided)"
set_fact:
nsupdate_server_public: "{{ external_nsupdate_keys['public']['server'] }}"
@@ -72,6 +71,5 @@
entries: "{{ public_records }}"
- name: "Generate the final dns_records_add"
- set_fact:
+ set_fact:
dns_records_add: "{{ private_named_records + public_named_records }}"
-
diff --git a/playbooks/provisioning/openstack/openstack_dns_views.yml b/playbooks/provisioning/openstack/openstack_dns_views.yml
index 611ed9f82..ea0a7cb96 100644
--- a/playbooks/provisioning/openstack/openstack_dns_views.yml
+++ b/playbooks/provisioning/openstack/openstack_dns_views.yml
@@ -1,8 +1,7 @@
---
-
- name: "Generate ACL list for DNS server"
set_fact:
- acl_list: "{{ acl_list | default([]) + [ (hostvars[item]['openstack']['private_v4'] + '/32') ] }}"
+ acl_list: "{{ acl_list | default([]) + [ (hostvars[item]['openstack']['private_v4'] + '/32') ] }}"
with_items: "{{ groups['cluster_hosts'] }}"
- name: "Generate the private view"
@@ -22,6 +21,5 @@
forwarder: "{{ public_dns_nameservers }}"
- name: "Generate the final named_config_views"
- set_fact:
+ set_fact:
named_config_views: "{{ private_named_view + public_named_view }}"
-
diff --git a/playbooks/provisioning/openstack/post-provision-openstack.yml b/playbooks/provisioning/openstack/post-provision-openstack.yml
index e1faf14eb..4e42c1c7f 100644
--- a/playbooks/provisioning/openstack/post-provision-openstack.yml
+++ b/playbooks/provisioning/openstack/post-provision-openstack.yml
@@ -1,5 +1,4 @@
---
-
# Assign hostnames
- hosts: cluster_hosts
become: true
@@ -57,4 +56,3 @@
dest: /etc/sysconfig/network
regexp: "IP4_NAMESERVERS={{ hostvars['localhost'].private_dns_server }}"
line: "IP4_NAMESERVERS={{ hostvars['localhost'].private_dns_server }}"
-
diff --git a/playbooks/provisioning/openstack/pre-install.yml b/playbooks/provisioning/openstack/pre-install.yml
index 4da007a16..629182d49 100644
--- a/playbooks/provisioning/openstack/pre-install.yml
+++ b/playbooks/provisioning/openstack/pre-install.yml
@@ -1,5 +1,4 @@
---
-
###############################
# OpenShift Pre-Requisites
@@ -13,4 +12,3 @@
- { role: subscription-manager, when: hostvars.localhost.rhsm_register, tags: 'subscription-manager', ansible_sudo: true }
- { role: docker, tags: 'docker' }
- { role: openshift-prep, tags: 'openshift-prep' }
-
diff --git a/playbooks/provisioning/openstack/sample-inventory/clouds.yaml b/playbooks/provisioning/openstack/sample-inventory/clouds.yaml
index c266426c6..8182d2995 100644
--- a/playbooks/provisioning/openstack/sample-inventory/clouds.yaml
+++ b/playbooks/provisioning/openstack/sample-inventory/clouds.yaml
@@ -1,5 +1,5 @@
+---
ansible:
use_hostnames: True
expand_hostvars: True
fail_on_errors: True
-
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
index 31e0a61ed..047923253 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
@@ -1,3 +1,4 @@
+---
env_id: "openshift"
public_dns_domain: "example.com"
public_dns_nameservers: []