Skip to content

Commit 9997a64

Browse files
doc: add documentation for (cluster_)public_addrs options
Document the spec and resource options (they're basically the same) for specifying public addresses that will be managed automatically by CTDB. Signed-off-by: John Mulligan <[email protected]>
1 parent e264909 commit 9997a64

File tree

2 files changed

+46
-3
lines changed

2 files changed

+46
-3
lines changed

doc/cephadm/services/smb.rst

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,21 +105,43 @@ custom_dns
105105
Active Directory even if the Ceph host nodes are not tied into the Active
106106
Directory DNS domain(s).
107107

108-
include_ceph_users:
108+
include_ceph_users
109109
A list of cephx user (aka entity) names that the Samba Containers may use.
110110
The cephx keys for each user in the list will automatically be added to
111111
the keyring in the container.
112112

113-
cluster_meta_uri:
113+
cluster_meta_uri
114114
A string containing a URI that identifies where the cluster structure
115115
metadata will be stored. Required if ``clustered`` feature is set. Must be
116116
a RADOS pseudo-URI.
117117

118-
cluster_lock_uri:
118+
cluster_lock_uri
119119
A string containing a URI that identifies where Samba/CTDB will store a
120120
cluster lock. Required if ``clustered`` feature is set. Must be a RADOS
121121
pseudo-URI.
122122

123+
cluster_public_addrs
124+
List of objects; optional. Supported only when using Samba's clustering.
125+
Assign "virtual" IP addresses that will be managed by the clustering
126+
subsystem and may automatically move between nodes running Samba
127+
containers.
128+
Fields:
129+
130+
address
131+
Required string. An IP address with a required prefix length (example:
132+
``192.168.4.51/24``). This address will be assigned to one of the
133+
host's network devices and managed automatically.
134+
destination
135+
Optional. String or list of strings. A ``destination`` defines where
136+
the system will assign the managed IPs. Each string value must be a
137+
network address (example ``192.168.4.0/24``). One or more destinations
138+
may be supplied. The typical case is to use exactly one destination and
139+
so the value may be supplied as a string, rather than a list with a
140+
single item. Each destination network will be mapped to a device on a
141+
host. Run ``cephadm list-networks`` for an example of these mappings.
142+
If destination is not supplied the network is automatically determined
143+
using the address value supplied and taken as the destination.
144+
123145

124146
.. note::
125147

doc/mgr/smb.rst

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,27 @@ clustering
376376
enables clustering regardless of the placement count. A value of ``never``
377377
disables clustering regardless of the placement count. If unspecified,
378378
``default`` is assumed.
379+
public_addrs
380+
List of objects; optional. Supported only when using Samba's clustering.
381+
Assign "virtual" IP addresses that will be managed by the clustering
382+
subsystem and may automatically move between nodes running Samba
383+
containers.
384+
Fields:
385+
386+
address
387+
Required string. An IP address with a required prefix length (example:
388+
``192.168.4.51/24``). This address will be assigned to one of the
389+
host's network devices and managed automatically.
390+
destination
391+
Optional. String or list of strings. A ``destination`` defines where
392+
the system will assign the managed IPs. Each string value must be a
393+
network address (example ``192.168.4.0/24``). One or more destinations
394+
may be supplied. The typical case is to use exactly one destination and
395+
so the value may be supplied as a string, rather than a list with a
396+
single item. Each destination network will be mapped to a device on a
397+
host. Run ``cephadm list-networks`` for an example of these mappings.
398+
If destination is not supplied the network is automatically determined
399+
using the address value supplied and taken as the destination.
379400
custom_smb_global_options
380401
Optional mapping. Specify key-value pairs that will be directly added to
381402
the global ``smb.conf`` options (or equivalent) of a Samba server. Do

0 commit comments

Comments
 (0)