Skip to content

Commit 8a0f7bc

Browse files
committed
Remove unnecessary curly brackets
1 parent ba3705b commit 8a0f7bc

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

doc/source/configuration/ci-cd.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,26 +57,26 @@ Runner Deployment
5757
Ideally an Infra VM could be used here or failing that the control host.
5858
Wherever it is deployed the host will need access to the :code:`admin_network`, :code:`public_network` and the :code:`pulp registry` on the seed.
5959

60-
2. Edit the environment's :code:`${KAYOBE_CONFIG_PATH}/environments/${KAYOBE_ENVIRONMENT}/inventory/groups` to add the predefined :code:`github-runners` group to :code:`infra-vms`
60+
2. Edit the environment's :code:`$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/inventory/groups` to add the predefined :code:`github-runners` group to :code:`infra-vms`
6161

6262
.. code-block:: ini
6363
6464
[infra-vms:children]
6565
github-runners
6666
67-
3. Edit the environment's :code:`${KAYOBE_CONFIG_PATH}/environments/${KAYOBE_ENVIRONMENT}/inventory/hosts` to define the host(s) that will host the runners.
67+
3. Edit the environment's :code:`$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/inventory/hosts` to define the host(s) that will host the runners.
6868

6969
.. code-block:: ini
7070
7171
[github-runners]
7272
prod-runner-01
7373
74-
4. Provide all the relevant Kayobe :code:`group_vars` for :code:`github-runners` under :code:`${KAYOBE_CONFIG_PATH}/environments/${KAYOBE_ENVIRONMENT}/inventory/group_vars/github-runners`
74+
4. Provide all the relevant Kayobe :code:`group_vars` for :code:`github-runners` under :code:`$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/inventory/group_vars/github-runners`
7575
* `infra-vms` ensuring all required `infra_vm_extra_network_interfaces` are defined
7676
* `network-interfaces`
7777
* `python-interpreter.yml` ensuring that `ansible_python_interpreter: /usr/bin/python3` has been set
7878

79-
5. Edit the ``${KAYOBE_CONFIG_PATH}/inventory/group_vars/github-runners/runners.yml`` file which will contain the variables required to deploy a series of runners.
79+
5. Edit the ``$KAYOBE_CONFIG_PATH/inventory/group_vars/github-runners/runners.yml`` file which will contain the variables required to deploy a series of runners.
8080
Below is a core set of variables that will require consideration and modification for successful deployment of the runners.
8181
The number of runners deployed can be configured by removing and extending the dict :code:`github-runners`.
8282
As for how many runners present three is suitable number as this would prevent situations where long running jobs could halt progress other tasks whilst waiting for a free runner.
@@ -120,7 +120,7 @@ Runner Deployment
120120

121121
7. If the host is an actual Infra VM then please refer to upstream `Infrastructure VMs <https://docs.openstack.org/kayobe/latest/configuration/reference/infra-vms.html>`__ documentation for additional configuration and steps.
122122

123-
8. Run :code:`kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/deploy-github-runner.yml`
123+
8. Run :code:`kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/deploy-github-runner.yml`
124124

125125
9. Check runners have registered properly by visiting the repository's :code:`Action` tab -> :code:`Runners` -> :code:`Self-hosted runners`
126126

@@ -130,9 +130,9 @@ Runner Deployment
130130
Workflow Deployment
131131
-------------------
132132

133-
1. Edit :code:`${KAYOBE_CONFIG_PATH}/inventory/group_vars/github-writer/writer.yml` in the base configuration making the appropriate changes to your deployments specific needs. See documentation for `stackhpc.kayobe_workflows.github <https://github.com/stackhpc/ansible-collection-kayobe-workflows/tree/main/roles/github>`__.
133+
1. Edit :code:`$KAYOBE_CONFIG_PATH/inventory/group_vars/github-writer/writer.yml` in the base configuration making the appropriate changes to your deployments specific needs. See documentation for `stackhpc.kayobe_workflows.github <https://github.com/stackhpc/ansible-collection-kayobe-workflows/tree/main/roles/github>`__.
134134

135-
2. Run :code:`kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/write-github-workflows.yml`
135+
2. Run :code:`kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/write-github-workflows.yml`
136136

137137
3. Add all required secrets and variables to repository either via the GitHub UI or GitHub CLI (may require repository owner)
138138

doc/source/configuration/lvm.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ hosts:
9393

9494
.. code-block:: console
9595
96-
mkdir -p ${KAYOBE_CONFIG_PATH}/hooks/overcloud-host-configure/pre.d
97-
cd ${KAYOBE_CONFIG_PATH}/hooks/overcloud-host-configure/pre.d
96+
mkdir -p $KAYOBE_CONFIG_PATH/hooks/overcloud-host-configure/pre.d
97+
cd $KAYOBE_CONFIG_PATH/hooks/overcloud-host-configure/pre.d
9898
ln -s ../../../ansible/growroot.yml 30-growroot.yml

doc/source/configuration/swap.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ hosts:
2323

2424
.. code-block:: console
2525
26-
mkdir -p ${KAYOBE_CONFIG_PATH}/hooks/overcloud-host-configure/post.d
27-
cd ${KAYOBE_CONFIG_PATH}/hooks/overcloud-host-configure/post.d
26+
mkdir -p $KAYOBE_CONFIG_PATH/hooks/overcloud-host-configure/post.d
27+
cd $KAYOBE_CONFIG_PATH/hooks/overcloud-host-configure/post.d
2828
ln -s ../../../ansible/swap.yml 10-swap.yml

doc/source/contributor/pre-commit.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ Once done you should find `pre-commit` is available within the `kayobe` virtuale
2929

3030
To run the playbook using the following command
3131

32-
- ``kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/install-pre-commit-hooks.yml``
32+
- ``kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/install-pre-commit-hooks.yml``
3333

3434
Whereas to run the playbook when control host bootstrap runs ensure it registered as symlink using the following command
3535

36-
- ``mkdir -p ${KAYOBE_CONFIG_PATH}/hooks/control-host-bootstrap/post.d``
37-
- ``ln -s ${KAYOBE_CONFIG_PATH}/ansible/install-pre-commit-hooks.yml ${KAYOBE_CONFIG_PATH}/hooks/control-host-bootstrap/post.d/install-pre-commit-hooks.yml``
36+
- ``mkdir -p $KAYOBE_CONFIG_PATH/hooks/control-host-bootstrap/post.d``
37+
- ``ln -s $KAYOBE_CONFIG_PATH/ansible/install-pre-commit-hooks.yml $KAYOBE_CONFIG_PATH/hooks/control-host-bootstrap/post.d/install-pre-commit-hooks.yml``
3838

3939
All that remains is the installation of the hooks themselves which can be accomplished either by
4040
running `pre-commit run` or using `git commit` when you have changes that need to be committed.

doc/source/operations/bifrost-hardware-inventory-management.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ configured to network boot on the provisioning network, the following commands
2626
will instruct them to PXE boot. The nodes will boot on the Ironic Python Agent
2727
kernel and ramdisk, which is configured to extract hardware information and
2828
send it to Bifrost. Note that IPMI credentials can be found in the encrypted
29-
file located at ``${KAYOBE_CONFIG_PATH}/secrets.yml``.
29+
file located at ``$KAYOBE_CONFIG_PATH/secrets.yml``.
3030

3131
.. code-block:: console
3232
@@ -56,8 +56,8 @@ in Bifrost:
5656
| da0c61af-b411-41b9-8909-df2509f2059b | example-hypervisor-01 | None | power off | enroll | False |
5757
+--------------------------------------+-----------------------+---------------+-------------+--------------------+-------------+
5858
59-
After editing ``${KAYOBE_CONFIG_PATH}/overcloud.yml`` (or
60-
``${KAYOBE_CONFIG_PATH}/environments/${KAYOBE_ENVIRONMENT}/overcloud.yml``
59+
After editing ``$KAYOBE_CONFIG_PATH/overcloud.yml`` (or
60+
``$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/overcloud.yml``
6161
if Kayobe environment is used) to add these new hosts to
6262
the correct groups, import them in Kayobe's inventory with:
6363

@@ -201,7 +201,7 @@ To build ipa image with extra-hardware you need to edit ``ipa.yml`` and add thi
201201
- "extra-hardware"
202202
203203
Extract introspection data from Bifrost with Kayobe. JSON files will be created
204-
into ``${KAYOBE_CONFIG_PATH}/overcloud-introspection-data``:
204+
into ``$KAYOBE_CONFIG_PATH/overcloud-introspection-data``:
205205

206206
.. code-block:: console
207207
@@ -210,7 +210,7 @@ into ``${KAYOBE_CONFIG_PATH}/overcloud-introspection-data``:
210210
Using ADVise
211211
------------
212212

213-
The Ansible playbook ``advise-run.yml`` can be found at ``${KAYOBE_CONFIG_PATH}/ansible/advise-run.yml``.
213+
The Ansible playbook ``advise-run.yml`` can be found at ``$KAYOBE_CONFIG_PATH/ansible/advise-run.yml``.
214214

215215
The playbook will:
216216

@@ -220,8 +220,8 @@ The playbook will:
220220

221221
.. code-block:: console
222222
223-
cd ${KAYOBE_CONFIG_PATH}
224-
ansible-playbook ${KAYOBE_CONFIG_PATH}/ansible/advise-run.yml
223+
cd $KAYOBE_CONFIG_PATH
224+
ansible-playbook $KAYOBE_CONFIG_PATH/ansible/advise-run.yml
225225
226226
The playbook has the following optional parameters:
227227

doc/source/operations/hotfix-playbook.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ The playbook can be invoked with:
2020

2121
.. code-block:: console
2222
23-
kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/hotfix-containers.yml
23+
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/hotfix-containers.yml
2424
2525
Playbook variables:
2626
-------------------
@@ -49,7 +49,7 @@ to a file, then add them as an extra var. e.g:
4949

5050
.. code-block:: console
5151
52-
kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/hotfix-containers.yml -e "@~/vars.yml"
52+
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/hotfix-containers.yml -e "@~/vars.yml"
5353
5454
5555
Example Variables file

doc/source/operations/octavia.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ With your kayobe environment activated, you can build a new amphora image with:
1212

1313
.. code-block:: console
1414
15-
kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/octavia-amphora-image-build.yml
15+
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/octavia-amphora-image-build.yml
1616
1717
The resultant image is based on Ubuntu. By default the image will be built on the
1818
seed, but it is possible to change the group in the ansible inventory using the
@@ -29,7 +29,7 @@ You can then run the playbook to upload the image:
2929

3030
.. code-block:: console
3131
32-
kayobe playbook run ${KAYOBE_CONFIG_PATH}/ansible/octavia-amphora-image-register.yml
32+
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/octavia-amphora-image-register.yml
3333
3434
This will rename the old image by adding a timestamp suffix, before uploading a
3535
new image with the name, ``amphora-x64-haproxy``. Octavia should be configured

doc/source/operations/openstack-reconfiguration.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ service is handled less well, because of Ansible's imperative style.
1010

1111
To remove a service, it is disabled in Kayobe's Kolla config, which prevents
1212
other services from communicating with it. For example, to disable
13-
``cinder-backup``, edit ``${KAYOBE_CONFIG_PATH}/kolla.yml``:
13+
``cinder-backup``, edit ``$KAYOBE_CONFIG_PATH/kolla.yml``:
1414

1515
.. code-block:: diff
1616
@@ -50,7 +50,7 @@ Use a command of this form:
5050

5151
.. code-block:: console
5252
53-
kayobe# ansible-vault edit ${KAYOBE_CONFIG_PATH}/secrets.yml --vault-password-file=<Vault password file path>
53+
kayobe# ansible-vault edit $KAYOBE_CONFIG_PATH/secrets.yml --vault-password-file=<Vault password file path>
5454
5555
Concatenate the contents of the certificate and key files to create
5656
``secrets_kolla_external_tls_cert``. The certificates should be installed in
@@ -60,7 +60,7 @@ this order:
6060
* Any intermediate certificates
6161
* The TLS certificate private key
6262

63-
In ``${KAYOBE_CONFIG_PATH}/kolla.yml``, set the following:
63+
In ``$KAYOBE_CONFIG_PATH/kolla.yml``, set the following:
6464

6565
.. code-block:: yaml
6666

0 commit comments

Comments
 (0)