From 847996632a0f631b95216e6708db04b2c04e1019 Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Wed, 29 Nov 2017 14:34:22 +0100 Subject: Update the doc text --- playbooks/openstack/advanced-configuration.md | 10 +++++----- playbooks/openstack/sample-inventory/inventory.py | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'playbooks/openstack') diff --git a/playbooks/openstack/advanced-configuration.md b/playbooks/openstack/advanced-configuration.md index 03f9c84cc..c0bdf5020 100644 --- a/playbooks/openstack/advanced-configuration.md +++ b/playbooks/openstack/advanced-configuration.md @@ -49,14 +49,14 @@ Otherwise, even if there are differences between the two versions, installation ### Configure DNS -OpenShift requires two DNS records to function fully. The first one poinst to +OpenShift requires two DNS records to function fully. The first one points to the master/load balancer and provides the UI/API access. The other one is a wildcard domain that resolves app route requests to the infra node. If you followed the default installation from the README section, there is no -DNS configured. We can add two entries to your `/etc/hosts` to do a quick -validation. A real deployment will however require a DNS server with the -following entries set. +DNS configured. You should add two entries to the `/etc/hosts` file on the +Ansible host (where you to do a quick validation. A real deployment will +however require a DNS server with the following entries set. First, run the `openstack server list` command and note the floating IP addresses of the *master* and *infra* nodes (we will use `10.40.128.130` for @@ -69,7 +69,7 @@ Then add the following entries to your `/etc/hosts`: 10.40.128.134 cakephp-mysql-example-test.apps.openshift.example.com ``` -I.e. point the cluster domain (as defined in the +This points the cluster domain (as defined in the `openshift_master_cluster_public_hostname` Ansible variable in `OSEv3`) to the master node and any routes for deployed apps to the infra node. diff --git a/playbooks/openstack/sample-inventory/inventory.py b/playbooks/openstack/sample-inventory/inventory.py index 6fa219f22..ad3fd936b 100755 --- a/playbooks/openstack/sample-inventory/inventory.py +++ b/playbooks/openstack/sample-inventory/inventory.py @@ -91,6 +91,7 @@ def build_inventory(): # performance issues. hostvars['openshift_ip'] = server.private_v4 hostvars['openshift_hostname'] = server.private_v4 + hostvars['openshift_public_hostname'] = server.name node_labels = server.metadata.get('node_labels') if node_labels: -- cgit v1.2.3