Skip to content

Commit ea6d1e6

Browse files
authored
Merge pull request #1207 from stackhpc/magnum-capi-docs-update
Magnum CAPI docs update
2 parents 3e1ec70 + 9e3e39e commit ea6d1e6

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

doc/source/configuration/magnum-capi.rst

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ To deploy the CAPI management cluster using this site-specific environment, run
6060

6161
.. code-block:: bash
6262
63-
# Activate the environment
64-
./bin/activate <site-specific-name>
65-
6663
# Install or update the local Ansible Python venv
6764
./bin/ensure-venv
6865
66+
# Activate the environment
67+
source bin/activate <site-specific-name>
68+
6969
# Install or update Ansible dependencies
7070
ansible-galaxy install -f -r ./requirements.yml
7171
@@ -103,12 +103,7 @@ To configure the Magnum service with the Cluster API driver enabled, first ensur
103103

104104
Next, copy the CAPI management cluster's kubeconfig file into your stackhpc-kayobe-config environment (e.g. ``<your-skc-environment>/kolla/config/magnum/kubeconfig``). This file must be Ansible vault encrypted.
105105

106-
The following config should also be set in your stackhpc-kayobe-config environment:
107-
108-
.. code-block:: yaml
109-
:caption: kolla/globals.yml
110-
111-
magnum_capi_helm_driver_enabled: true
106+
The presence of a kubeconfig file in the Magnum config directory is used by Kolla to determine whether the CAPI Helm driver should be enabled.
112107

113108
To apply the configuration, run ``kayobe overcloud service reconfigure -kt magnum``.
114109

0 commit comments

Comments
 (0)