@@ -399,13 +399,6 @@ the table are linked to more details elsewhere in the user guide.
399
399
+---------------------------------------+--------------------+---------------+
400
400
| `k8s_keystone_auth_tag `_ | see below | see below |
401
401
+---------------------------------------+--------------------+---------------+
402
- | `tiller_enabled `_ | - true | false |
403
- | | - false | |
404
- +---------------------------------------+--------------------+---------------+
405
- | `tiller_tag `_ | see below | "" |
406
- +---------------------------------------+--------------------+---------------+
407
- | `tiller_namespace `_ | see below | see below |
408
- +---------------------------------------+--------------------+---------------+
409
402
| `helm_client_url `_ | see below | see below |
410
403
+---------------------------------------+--------------------+---------------+
411
404
| `helm_client_sha256 `_ | see below | see below |
@@ -1404,22 +1397,6 @@ _`k8s_keystone_auth_tag`
1404
1397
Train default: v1.14.0
1405
1398
Ussuri default: v1.18.0
1406
1399
1407
- _`tiller_enabled `
1408
- If set to true, tiller will be deployed in the kube-system namespace.
1409
- Ussuri default: false
1410
- Train default: false
1411
-
1412
- _`tiller_tag `
1413
- This label allows users to override the default container tag for Tiller.
1414
- For additional tags, `refer to Tiller page
1415
- <https://github.com/helm/helm/tags> `_ and look for tags<v3.0.0.
1416
- Train default: v2.12.3
1417
- Ussuri default: v2.16.7
1418
-
1419
- _`tiller_namespace `
1420
- The namespace in which Tiller and Helm v2 chart install jobs are installed.
1421
- Default: magnum-tiller
1422
-
1423
1400
_`helm_client_url `
1424
1401
URL of the helm client binary.
1425
1402
Default: ''
@@ -1431,8 +1408,7 @@ _`helm_client_sha256`
1431
1408
_`helm_client_tag `
1432
1409
This label allows users to override the default container tag for Helm
1433
1410
client. For additional tags, `refer to Helm client page
1434
- <https://github.com/helm/helm/tags> `_. You must use identical tiller_tag if
1435
- you wish to use Tiller (for helm_client_tag<v3.0.0).
1411
+ <https://github.com/helm/helm/tags> `_.
1436
1412
Ussuri default: v3.2.1
1437
1413
1438
1414
_`master_lb_floating_ip_enabled `
@@ -1683,8 +1659,6 @@ _`ingress_controller`
1683
1659
Controller is configured. For more details about octavia-ingress-controller
1684
1660
please refer to `cloud-provider-openstack document
1685
1661
<https://github.com/kubernetes/cloud-provider-openstack/blob/master/docs/octavia-ingress-controller/using-octavia-ingress-controller.md> `_
1686
- To use 'nginx' ingress controller, tiller_enabled must be true when using
1687
- helm_client_tag<v3.0.0.
1688
1662
1689
1663
_`ingress_controller_role `
1690
1664
This label defines the role nodes should have to run an instance of the
0 commit comments