From 3859a5b5aa65b4ece47b173fca78b2e93400f22e Mon Sep 17 00:00:00 2001
From: Renis <renis.makadia@att.com>
Date: Fri, 2 Mar 2018 10:48:29 -0800
Subject: [PATCH] Fixes/Updates OSH Developer and Multinode install guide
This PS fixes few typos and adds DNS entry update section
to notify user.
Change-Id: I59f5c90aaa06a5996c3ddb7a7b1bd3c4adfe0eb7
---
.../install/developer/deploy-with-ceph.rst | 4 ++++
.../install/developer/deploy-with-nfs.rst | 4 ++++
.../developer/kubernetes-and-common-setup.rst | 6 ++++++
doc/source/install/multinode.rst | 20 +++++++++++++++----
4 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/doc/source/install/developer/deploy-with-ceph.rst b/doc/source/install/developer/deploy-with-ceph.rst
index 2e09cee37a..ec802f70f3 100644
--- a/doc/source/install/developer/deploy-with-ceph.rst
+++ b/doc/source/install/developer/deploy-with-ceph.rst
@@ -2,6 +2,10 @@
Deployment With Ceph
====================
+.. note::
+ For other deployment options, select appropriate ``Deployment with ...``
+ option from `Index <../developer/index.html>`__ page.
+
Deploy Ceph
^^^^^^^^^^^
diff --git a/doc/source/install/developer/deploy-with-nfs.rst b/doc/source/install/developer/deploy-with-nfs.rst
index 1da35cd6a5..0b2f5a5945 100644
--- a/doc/source/install/developer/deploy-with-nfs.rst
+++ b/doc/source/install/developer/deploy-with-nfs.rst
@@ -2,6 +2,10 @@
Deployment With NFS
===================
+.. note::
+ For other deployment options, select appropriate ``Deployment with ...``
+ option from `Index <../developer/index.html>`__ page.
+
Deploy NFS Provisioner
^^^^^^^^^^^^^^^^^^^^^^
diff --git a/doc/source/install/developer/kubernetes-and-common-setup.rst b/doc/source/install/developer/kubernetes-and-common-setup.rst
index 6abb986a1c..ded5ebeb27 100644
--- a/doc/source/install/developer/kubernetes-and-common-setup.rst
+++ b/doc/source/install/developer/kubernetes-and-common-setup.rst
@@ -26,6 +26,12 @@ should be cloned:
git clone https://git.openstack.org/openstack/openstack-helm.git
+.. note::
+ This installation, by default will use Google DNS servers, 8.8.8.8 or 8.8.4.4
+ and updates resolv.conf. These DNS nameserver entries can be changed by
+ updating file ``/opt/openstack-helm-infra/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml``
+ under section ``external_dns_nameservers``.
+
Deploy Kubernetes & Helm
------------------------
diff --git a/doc/source/install/multinode.rst b/doc/source/install/multinode.rst
index 79d5ee7abd..d87aa519f0 100644
--- a/doc/source/install/multinode.rst
+++ b/doc/source/install/multinode.rst
@@ -55,9 +55,9 @@ On the worker nodes
#!/bin/bash
set -xe
- apt-get update
- apt-get install --no-install-recommends -y \
- git
+ sudo apt-get update
+ sudo apt-get install --no-install-recommends -y \
+ git
SSH-Key preparation
@@ -78,7 +78,7 @@ should be cloned onto each node in the cluster:
#!/bin/bash
set -xe
- chown -R ubuntu: /opt
+ sudo chown -R ubuntu: /opt
git clone https://git.openstack.org/openstack/openstack-helm-infra.git /opt/openstack-helm-infra
git clone https://git.openstack.org/openstack/openstack-helm.git /opt/openstack-helm
@@ -141,6 +141,15 @@ On the master node create an environment file for the cluster:
domain: cluster.local
EOF
+
+.. note::
+ This installation, by default will use Google DNS servers, 8.8.8.8 or 8.8.4.4
+ and updates resolv.conf. These DNS nameserver entries can be changed by
+ updating file ``/openstack-helm-infra/tools/images/kubeadm-aio/assets/opt/playbooks/vars.yaml``
+ under section ``external_dns_nameservers``. This change must be done on each
+ node in your cluster.
+
+
Run the playbooks
-----------------
@@ -157,6 +166,9 @@ On the master node run the playbooks:
Deploy OpenStack-Helm
=====================
+.. note::
+ The following commands all assume that they are run from the ``openstack-helm`` directory.
+
Setup Clients on the host and assemble the charts
-------------------------------------------------