Skip to content

Commit bf0562c

Browse files
Merge pull request #579 from dtantsur/no-inspector
User guide: remove mentions of Inspector from quick start
2 parents 5ea91d8 + 190aa46 commit bf0562c

File tree

1 file changed

+9
-67
lines changed

1 file changed

+9
-67
lines changed

docs/user-guide/src/quick-start.md

Lines changed: 9 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,6 @@ nodes:
180180
hostPort: 6385
181181
listenAddress: "0.0.0.0"
182182
protocol: TCP
183-
# Inspector API
184-
- containerPort: 5050
185-
hostPort: 5050
186-
listenAddress: "0.0.0.0"
187-
protocol: TCP
188183
```
189184
190185
As you can see, it has a few ports forwarded from the host. This is to make
@@ -297,49 +292,18 @@ mkdir ironic
297292

298293
#### Authentication configuration
299294

300-
Create authentication configuration for Ironic and Inspector. You will need to
301-
generate a username and password for each. We will here refer to them as
302-
`IRONIC_USERNAME`, `IRONIC_PASSWORD`, `INSPECTOR_USERNAME` and
303-
`INSPECTOR_PASSWORD`.
304-
305-
Create a file `ironic-auth-config` with configuration for how to access Ironic.
306-
This will be use by Inspector. It should have the following content:
307-
308-
```conf
309-
[ironic]
310-
auth_type=http_basic
311-
username=IRONIC_USERNAME
312-
password=IRONIC_PASSWORD
313-
```
314-
315-
Create a file `ironic-inspector-auth-config` with configuration for how to
316-
access Inspector. This will be used by Ironic. It should have the following
317-
content:
318-
319-
```conf
320-
[inspector]
321-
auth_type=http_basic
322-
username=INSPECTOR_USERNAME
323-
password=INSPECTOR_PASSWORD
324-
```
325-
326-
To enable basic auth, we need to create secrets containing the keys
327-
`IRONIC_HTPASSWD` and `INSPECTOR_HTPASSWD` with values generated from the
328-
credentials using htpasswd. We will do this by creating two files
329-
`ironic-htpasswd` and `ironic-inspector-htpasswd` with the following content.
295+
Create authentication configuration for Ironic. You will need to
296+
generate a username and password for it. We will here refer to them as
297+
`IRONIC_USERNAME` and `IRONIC_PASSWORD`.
330298

331-
`ironic-htpasswd`:
299+
To enable basic auth, we need to create a secret containing the key
300+
`IRONIC_HTPASSWD` with values generated from the credentials using htpasswd. We
301+
will do this by creating a file `ironic-htpasswd` with the following content.
332302

333303
```bash
334304
IRONIC_HTPASSWD="<output of `htpasswd -n -b -B IRONIC_USERNAME IRONIC_PASSWORD`>"
335305
```
336306

337-
Similarly for `ironic-inspector-htpasswd`:
338-
339-
```bash
340-
INSPECTOR_HTPASSWD="<output of `htpasswd -n -b -B INSPECTOR_USERNAME INSPECTOR_PASSWORD`>"
341-
```
342-
343307
#### Ironic environment variables
344308

345309
In this section we will create a file containing environment variables used to
@@ -410,10 +374,7 @@ you should have a file structure like this:
410374

411375
```text
412376
ironic/
413-
├── ironic-auth-config
414377
├── ironic-htpasswd
415-
├── ironic-inspector-auth-config
416-
├── ironic-inspector-htpasswd
417378
├── ironic-patch.yaml
418379
├── ironic_bmo.env
419380
└── kustomization.yaml
@@ -453,8 +414,7 @@ patches:
453414
# The TLS component adds certificates but it cannot know the exact IPs of our environment.
454415
# Here we patch the certificates to have the correct IPs.
455416
# - 192.168.1.7: management computer IP in out of band network
456-
# - 172.18.0.2: kind cluster node IP. This is what Ironic will see attached to the interface
457-
# and use to communicate with Inspector.
417+
# - 172.18.0.2: kind cluster node IP. This is what Ironic will see attached to the interface.
458418
# - 192.168.0.150: management computer IP in the other network
459419
- patch: |-
460420
- op: replace
@@ -475,7 +435,7 @@ patches:
475435
# value: 172.18.0.2
476436
target:
477437
kind: Certificate
478-
name: ironic-cert|ironic-inspector-cert
438+
name: ironic-cert
479439
# The CA certificate should not have any IP address so we remove it.
480440
- patch: |-
481441
- op: remove
@@ -491,16 +451,6 @@ secretGenerator:
491451
behavior: create
492452
envs:
493453
- ironic-htpasswd
494-
- name: ironic-inspector-htpasswd
495-
behavior: create
496-
envs:
497-
- ironic-inspector-htpasswd
498-
- name: ironic-auth-config
499-
files:
500-
- auth-config=ironic-auth-config
501-
- name: ironic-inspector-auth-config
502-
files:
503-
- auth-config=ironic-inspector-auth-config
504454
```
505455

506456
You can check that it works and inspect the resulting manifest by running this:
@@ -525,12 +475,10 @@ a folder for the kustomization:
525475
mkdir bmo
526476
```
527477

528-
Create files containing the credentials for Ironic and Inspector:
478+
Create files containing the credentials for Ironic:
529479

530480
- ironic-username
531481
- ironic-password
532-
- ironic-inspector-username
533-
- ironic-inspector-password
534482

535483
We will use kustomize to create secrets from these that Bare Metal Operator can
536484
use to access Ironic.
@@ -584,10 +532,6 @@ secretGenerator:
584532
files:
585533
- username=ironic-username
586534
- password=ironic-password
587-
- name: ironic-inspector-credentials
588-
files:
589-
- username=ironic-inspector-username
590-
- password=ironic-inspector-password
591535
```
592536

593537
At this point, you should have a folder structure like this:
@@ -596,8 +540,6 @@ At this point, you should have a folder structure like this:
596540
bmo/
597541
├── ironic-password
598542
├── ironic-username
599-
├── ironic-inspector-username
600-
├── ironic-inspector-password
601543
├── ironic.env
602544
└── kustomization.yaml
603545
```

0 commit comments

Comments
 (0)