Browse Source

Correct few doc problems and the description of security group

Change-Id: I22f908494e825fd89f1292c1de24b5e54e64d0c2
Tong Li 2 years ago
parent
commit
791fbe78d1

+ 20
- 10
workloads/ansible/shade/k8s/README.md View File

@@ -99,6 +99,7 @@ your own environment file. Here is an example of the file::
99 99
       service_ip_range: "172.16.0.0/24",
100 100
       dns_service_ip: "172.16.0.4",
101 101
 
102
+      cockroachdb_repo: "http://10.0.10.12/cockroachdb.tar.gz",
102 103
       flannel_repo: "https://github.com/coreos/flannel/releases/download/v0.7.0/flannel-v0.7.0-linux-amd64.tar.gz",
103 104
       k8s_repo: "https://storage.googleapis.com/kubernetes-release/release/v1.5.3/bin/linux/amd64/"
104 105
     }
@@ -198,33 +199,42 @@ If everything goes well, it will accomplish the following::
198 199
     7. Download software for worker node from the master node.
199 200
     8. Setup flanneld, docker, kubelet and kube-proxy on each work node.
200 201
     9. Install kubernetes dashboard and dns services.
202
+    10.Deploy cockroachdb cluster and its dashboard.
201 203
 
202 204
 
203
-## The method to run just a play, not the entire playbook
205
+## The method for running just a play, not the entire playbook
204 206
 
205
-The script will create an ansible inventory file name runhosts at the very
206
-first play, the inventory file will be place at the run directory of the
207
-playbook root. If you like to only run specify plays, you will be able to run
208
-the playbook like the following:
207
+The script will create an ansible inventory file named runhosts at the very
208
+first time you run the playbook, the inventory file will be place at a
209
+directory named "run" at the root directory of the playbook. This file will be
210
+updated in later runs if there are changes such as adding or removing hosts.
211
+With this file, if you like to run only few plays, you will be able to do
212
+that by following the example below:
209 213
 
210
-    ansible-playbook -i run/runhosts -e "action=apply env=leap password=XXXXX" site.yml
214
+    ansible-playbook -i run/runhosts -e "action=apply env=coreos password=XXXXX" site.yml
211 215
     --tags "common,master"
212 216
 
213 217
 The above command will use the runhosts inventory file and only run plays
214
-named common and master, all other plays in the play book will be skipped.
218
+named common and master, all other plays in the play book will be skipped. All
219
+available plays can be found in the site.yml file.
215 220
 
216 221
 
217 222
 ## Next Steps
218 223
 
219
-### Check its up
224
+### Check that everything is running correctly
220 225
 
221 226
 If there are no errors, you can use kubectl to work with your kubernetes
222
-cluster.
227
+cluster. Kubernetes and cockroachdb dashboards should be available at
228
+different ports. Point your browser to an accessible IP address with the
229
+following ports and your browser should show the dashboards.
230
+
231
+    <ip_address>:30000    kubernetes dashboard
232
+    <ip_address>:32256    cockroachdb dashboard
223 233
 
224 234
 ## Cleanup
225 235
 
226 236
 Once you're done with it, don't forget to nuke the whole thing::
227 237
 
228
-    ansible-playbook -e "action=destroy env=leap password=XXXXX" site.yml
238
+    ansible-playbook -e "action=destroy env=coreos password=XXXXX" site.yml
229 239
 
230 240
 The above command will destroy all the resources created.

+ 1
- 1
workloads/ansible/shade/k8s/roles/postprovision/tasks/destroy.yml View File

@@ -17,4 +17,4 @@
17 17
     availability_zone: "{{ app_env.availability_zone }}"
18 18
     validate_certs: "{{ app_env.validate_certs }}"
19 19
     name: k8s_sg
20
-    description: secuirty group for lampstack
20
+    description: secuirty group for kubernetes cluster

+ 1
- 1
workloads/ansible/shade/k8s/roles/prepare/tasks/apply.yml View File

@@ -42,7 +42,7 @@
42 42
     availability_zone: "{{ app_env.availability_zone }}"
43 43
     validate_certs: "{{ app_env.validate_certs }}"
44 44
     name: k8s_sg
45
-    description: security group for lampstack
45
+    description: security group for kubernetes cluster
46 46
 
47 47
 - name: Add security rules
48 48
   os_security_group_rule:

Loading…
Cancel
Save