summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack/advanced-configuration.md
diff options
context:
space:
mode:
authorTomas Sedovic <tomas@sedovic.cz>2017-11-01 16:43:13 +0100
committerTomas Sedovic <tomas@sedovic.cz>2017-11-07 14:35:47 +1100
commit79f29bc825286c4f69073827a5b6d71f71f47c91 (patch)
treedb91c04c153aef1419871a7843e8d415c49e0a60 /playbooks/openstack/advanced-configuration.md
parent23674d565f2801d88060bd0443ec384fbdcdad59 (diff)
downloadopenshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.gz
openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.bz2
openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.tar.xz
openshift-79f29bc825286c4f69073827a5b6d71f71f47c91.zip
Add the DNS updates and rename the openstack vars
Most of the vars in `roles/openshift_openstack/defaults/main.yml` are now prefixed with `openstack_`.
Diffstat (limited to 'playbooks/openstack/advanced-configuration.md')
-rw-r--r--playbooks/openstack/advanced-configuration.md11
1 files changed, 5 insertions, 6 deletions
diff --git a/playbooks/openstack/advanced-configuration.md b/playbooks/openstack/advanced-configuration.md
index 72bb95254..5ffec708a 100644
--- a/playbooks/openstack/advanced-configuration.md
+++ b/playbooks/openstack/advanced-configuration.md
@@ -192,11 +192,10 @@ The `openstack_<role name>_hostname` is a set of variables used for customising
hostnames of servers with a given role. When such a variable stays commented,
default hostname (usually the role name) is used.
-The `public_dns_nameservers` is a list of DNS servers accessible from all
-the created Nova servers. These will be serving as your DNS forwarders for
-external FQDNs that do not belong to the cluster's DNS domain and its subdomains.
-If you're unsure what to put in here, you can try the google or opendns servers,
-but note that some organizations may be blocking them.
+The `openstack_dns_nameservers` is a list of DNS servers accessible from all
+the created Nova servers. These will provide the internal name resolution for
+your OpenShift nodes (as well as upstream name resolution for installing
+packages, etc.).
The `openshift_use_dnsmasq` controls either dnsmasq is deployed or not.
By default, dnsmasq is deployed and comes as the hosts' /etc/resolv.conf file
@@ -265,7 +264,7 @@ step for flannel and docker iptables configuration:
## Other configuration variables
-`openstack_ssh_public_key` is a Nova keypair - you can see your
+`openstack_keypair_name` is a Nova keypair - you can see your
keypairs with `openstack keypair list`. It must correspond to the
private SSH key Ansible will use to log into the created VMs. This is
`~/.ssh/id_rsa` by default, but you can use a different key by passing