summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-05-26 16:53:47 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-26 16:53:47 +0000
commitcc16a3d5cca645bdfb8af177c85ab06efe97c27b (patch)
treec13bbbd23c91674d5799cefa00dc7eb3b7f0936c
parentaaf39b1e4cc736fa6f192d46549afaab303c350d (diff)
parentcf6797cfbf7553dd64a465c0b0d99e4fe5631aab (diff)
Merge "Make RKE the default cluster deployment tool"
-rw-r--r--ansible/README.md19
-rw-r--r--ansible/site.yml2
-rw-r--r--docs/InstallGuide.rst23
3 files changed, 39 insertions, 5 deletions
diff --git a/ansible/README.md b/ansible/README.md
index 8d6e41ee..f82c750f 100644
--- a/ansible/README.md
+++ b/ansible/README.md
@@ -113,7 +113,7 @@ This playbook contains imports for all the other playbooks needed to deploy
wanted Kubernetes application:
- `upload_resources.yml`
- `infrastructure.yml`
- - `rancher_kubernetes.yml`
+ - `rke.yml`
- `application.yml` - this is an application related playbook
### Resource upload
@@ -139,7 +139,7 @@ Infrastructure setup is handled by `infrastructure.yml` playbook.
### Kubernetes cluster deployment
-Kubernetes cluster is deployment is handled by `rancher_kubernetes.yml` playbook.
+Kubernetes cluster deployment is handled by `rke.yml` playbook.
**Preconditions**:
- infrastructure deployed by running `infrastructure.yml` playbook
@@ -162,7 +162,7 @@ copied there after installer package is deployed and before installing the appli
Application Helm charts and configuration is better described in [application/README.md](./application/README.md)
**Preconditions**:
- - Kubernetes cluster must be up and running i.e. `rancher_kubernetes.yml` playbook has been run.
+ - Kubernetes cluster must be up and running i.e. `rke.yml` playbook has been run.
## Running playbooks
To run ansible playbook call `run_playbook.sh` with same arguments as you would
@@ -222,12 +222,25 @@ parts.
hosts:
infrastructure-server:
ansible_host: 10.8.8.9
+ #IP used for communication between infra and kubernetes nodes, must be specified.
+ cluster_ip: 10.8.8.9
# This is group of hosts which are/will be part of Kubernetes cluster.
kubernetes:
hosts:
kubernetes-node-1:
ansible_host: 10.8.8.13
+ #ip of the node that it uses for communication with k8s cluster.
+ cluster_ip: 10.8.8.13
+
+ # This is a group of hosts that are to be used as kubernetes control plane nodes.
+ # This means they host kubernetes api server, controller manager and scheduler.
+ # This example uses infra for this purpose, however note that any
+ # other host could be used including kubernetes nodes.
+ # cluster_ip needs to be set for hosts used as control planes.
+ kubernetes-control-plane:
+ hosts:
+ infrastructure-server
nfs-server:
hosts:
diff --git a/ansible/site.yml b/ansible/site.yml
index fbf2c389..7e22c5b2 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -15,6 +15,6 @@
# installer
- import_playbook: resources.yml
- import_playbook: infrastructure.yml
-- import_playbook: rancher_kubernetes.yml
+- import_playbook: rke.yml
- import_playbook: application.yml
diff --git a/docs/InstallGuide.rst b/docs/InstallGuide.rst
index 07255b77..7849047d 100644
--- a/docs/InstallGuide.rst
+++ b/docs/InstallGuide.rst
@@ -174,6 +174,15 @@ We need to setup the ``'hosts.yml'`` first, the template looks like this::
#ip of the node that it uses for communication with k8s cluster.
cluster_ip: 10.8.8.19
+ # This is a group of hosts that are to be used as kubernetes control plane nodes.
+ # This means they host kubernetes api server, controller manager and scheduler.
+ # This example uses infra for this purpose, however note that any
+ # other host could be used including kubernetes nodes.
+ # cluster_ip needs to be set for hosts used as control planes.
+ kubernetes-control-plane:
+ hosts:
+ infrastructure-server
+
nfs-server:
hosts:
kubernetes-node-1
@@ -233,6 +242,18 @@ After all the changes, the ``'hosts.yml'`` should look similar to this::
#ip of the node that it uses for communication with k8s cluster.
cluster_ip: 10.8.8.103
+ # This is a group of hosts that are to be used as kubernetes control plane nodes.
+ # This means they host kubernetes api server, controller manager and scheduler.
+ # This example uses infra for this purpose, however note that any
+ # other host could be used including kubernetes nodes.
+ # cluster_ip needs to be set for hosts used as control planes.
+ kubernetes-control-plane:
+ hosts:
+ infrastructure-server
+ ansible_host: 10.8.8.100
+ #IP used for communication between infra and kubernetes nodes, must be specified.
+ cluster_ip: 10.8.8.100
+
nfs-server:
hosts:
kubernetes-node-1
@@ -378,7 +399,7 @@ This will take a while so be patient.
- ``upload_resources.yml``
- ``infrastructure.yml``
-- ``rancher_kubernetes.yml``
+- ``rke.yml``
- ``application.yml``
----