summaryrefslogtreecommitdiffstats
path: root/playbooks/provisioning
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/provisioning')
-rw-r--r--playbooks/provisioning/openstack/README.md11
-rw-r--r--playbooks/provisioning/openstack/post-provision-openstack.yml8
-rw-r--r--playbooks/provisioning/openstack/provision-openstack.yml4
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml4
-rw-r--r--playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml48
5 files changed, 50 insertions, 25 deletions
diff --git a/playbooks/provisioning/openstack/README.md b/playbooks/provisioning/openstack/README.md
index 37868b2ea..a542e1493 100644
--- a/playbooks/provisioning/openstack/README.md
+++ b/playbooks/provisioning/openstack/README.md
@@ -75,6 +75,17 @@ stacks. Set it to true, if you experience issues with sec group rules
quotas. It trades security for number of rules, by sharing the same set
of firewall rules for master, node, etcd and infra nodes.
+#### Security notes
+
+Configure required `*_ingress_cidr` variables to restrict public access
+to provisioned servers from your laptop (a /32 notation should be used)
+or your trusted network. The most important is the `node_ingress_cidr`
+that restricts public access to the deployed DNS server and cluster
+nodes' ephemeral ports range.
+
+Note, the command ``curl https://api.ipify.org`` helps fiding an external
+IP address of your box (the ansible admin node).
+
### Update the DNS names in `inventory/hosts`
The different server groups are currently grouped by the domain name,
diff --git a/playbooks/provisioning/openstack/post-provision-openstack.yml b/playbooks/provisioning/openstack/post-provision-openstack.yml
index 4e42c1c7f..918f9e065 100644
--- a/playbooks/provisioning/openstack/post-provision-openstack.yml
+++ b/playbooks/provisioning/openstack/post-provision-openstack.yml
@@ -1,6 +1,7 @@
---
# Assign hostnames
- hosts: cluster_hosts
+ gather_facts: False
become: true
pre_tasks:
- include: pre_tasks.yml
@@ -9,6 +10,7 @@
# Subscribe DNS Host to allow for configuration below
- hosts: dns
+ gather_facts: False
become: true
roles:
- role: subscription-manager
@@ -17,11 +19,14 @@
# Determine which DNS server(s) to use for our generated records
- hosts: localhost
+ gather_facts: False
+ become: False
roles:
- dns-server-detect
# Build the DNS Server Views and Configure DNS Server(s)
- hosts: dns
+ gather_facts: False
become: true
pre_tasks:
- include: pre_tasks.yml
@@ -32,6 +37,8 @@
# Build and process DNS Records
- hosts: localhost
+ gather_facts: False
+ become: False
pre_tasks:
- include: pre_tasks.yml
- name: "Generate dns records"
@@ -41,6 +48,7 @@
# OpenShift Pre-Requisites
- hosts: OSEv3
+ gather_facts: False
become: true
tasks:
- name: "Edit /etc/resolv.conf on masters/nodes"
diff --git a/playbooks/provisioning/openstack/provision-openstack.yml b/playbooks/provisioning/openstack/provision-openstack.yml
index 628044de6..feea15d5d 100644
--- a/playbooks/provisioning/openstack/provision-openstack.yml
+++ b/playbooks/provisioning/openstack/provision-openstack.yml
@@ -1,6 +1,7 @@
---
- hosts: localhost
gather_facts: True
+ become: False
pre_tasks:
- include: pre_tasks.yml
roles:
@@ -32,12 +33,13 @@
- name: Refresh Server inventory
hosts: localhost
connection: local
+ become: False
gather_facts: False
tasks:
- meta: refresh_inventory
- hosts: cluster_hosts
- gather_facts: false
+ gather_facts: True
tasks:
- name: Debug hostvar
debug:
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
index 32ec43387..72a03132b 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -8,3 +8,7 @@ openshift_master_default_subdomain: "apps.{{ env_id }}.{{ public_dns_domain }}"
openshift_node_labels: "{{ openstack.metadata.node_labels }}"
osm_default_node_selector: 'region=primary'
+
+# For POCs or demo environments that are using smaller instances than
+# the official recommended values for RAM and DISK, uncomment the line below.
+#openshift_disable_check: disk_availability,memory_availability
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
index ff9aaab63..7c9033828 100644
--- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
+++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml
@@ -21,40 +21,40 @@ openstack_subnet_prefix: "192.168.99"
# # Red Hat subscription
# # Using Red Hat Satellite:
-# rhsm_register: True
-# rhsm_satellite: 'sat-6.example.com'
-# rhsm_org: 'OPENSHIFT_ORG'
-# rhsm_activationkey: '<activation-key>'
+#rhsm_register: True
+#rhsm_satellite: 'sat-6.example.com'
+#rhsm_org: 'OPENSHIFT_ORG'
+#rhsm_activationkey: '<activation-key>'
# # Or using RHN username, password and optionally pool:
-# rhsm_register: True
-# rhsm_username: '<username>'
-# rhsm_password: '<password>'
-# rhsm_pool: '<pool id>'
+#rhsm_register: True
+#rhsm_username: '<username>'
+#rhsm_password: '<password>'
+#rhsm_pool: '<pool id>'
-# rhsm_repos:
-# - "rhel-7-server-rpms"
-# - "rhel-7-server-ose-3.5-rpms"
-# - "rhel-7-server-extras-rpms"
-# - "rhel-7-fast-datapath-rpms"
+#rhsm_repos:
+# - "rhel-7-server-rpms"
+# - "rhel-7-server-ose-3.5-rpms"
+# - "rhel-7-server-extras-rpms"
+# - "rhel-7-fast-datapath-rpms"
# # Roll-your-own DNS
-# openstack_num_dns: 0
-# external_nsupdate_keys:
-# public:
-# key_secret: 'SKqKNdpfk7llKxZ57bbxUnUDobaaJp9t8CjXLJPl+fRI5mPcSBuxTAyvJPa6Y9R7vUg9DwCy/6WTpgLNqnV4Hg=='
-# key_algorithm: 'hmac-md5'
-# server: '192.168.1.1'
-# private:
-# key_secret: 'kVE2bVTgZjrdJipxPhID8BEZmbHD8cExlVPR+zbFpW6la8kL5wpXiwOh8q5AAosXQI5t95UXwq3Inx8QT58duw=='
-# key_algorithm: 'hmac-md5'
-# server: '192.168.1.2'
+#openstack_num_dns: 0
+#external_nsupdate_keys:
+# public:
+# key_secret: 'SKqKNdpfk7llKxZ57bbxUnUDobaaJp9t8CjXLJPl+fRI5mPcSBuxTAyvJPa6Y9R7vUg9DwCy/6WTpgLNqnV4Hg=='
+# key_algorithm: 'hmac-md5'
+# server: '192.168.1.1'
+# private:
+# key_secret: 'kVE2bVTgZjrdJipxPhID8BEZmbHD8cExlVPR+zbFpW6la8kL5wpXiwOh8q5AAosXQI5t95UXwq3Inx8QT58duw=='
+# key_algorithm: 'hmac-md5'
+# server: '192.168.1.2'
# NOTE(shadower): Do not change this value. The Ansible user is currently
# hardcoded to `openshift`.
ansible_user: openshift
-# Use a single security group for a cluster
+# # Use a single security group for a cluster
openstack_flat_secgrp: false