refactor: updated references

This commit is contained in:
David Allen 2024-12-11 10:57:42 -07:00 committed by David Allen
parent 582d42d2ff
commit b244d65903
Signed by: towk
GPG key ID: 0430CDBE22619155
5 changed files with 40 additions and 42 deletions

View file

@ -56,29 +56,28 @@ archives:
- magellan.1
nfpms:
- id: magellan
formats:
- deb
- rpm
- apk
- archlinux
maintainer: "David J. Allen <allend@lanl.gov>"
description: "Magellan is a discovery tool for BMCs."
homepage: "https://www.openchami.org"
license: MIT
section: utils
priority: optional
contents:
- src: magellan.1
dst: /usr/share/man/man1/
- id: magellan
formats:
- deb
- rpm
- apk
- archlinux
maintainer: "David J. Allen <allend@lanl.gov>"
description: "Magellan is a discovery tool for BMCs."
homepage: "https://towk2.me"
license: MIT
section: utils
priority: optional
contents:
- src: magellan.1
dst: /usr/share/man/man1/
dockers:
- image_templates:
- &amd64_linux_image ghcr.io/openchami/{{.ProjectName}}:{{ .Tag }}-amd64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}-amd64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-amd64
- &amd64_linux_image ghcr.io/davidallendj/{{.ProjectName}}:{{ .Tag }}-amd64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}-amd64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-amd64
use: buildx
build_flag_templates:
- "--pull"
@ -94,9 +93,9 @@ dockers:
- CHANGELOG.md
- README.md
- image_templates:
- &arm64v7_linux_image ghcr.io/openchami/{{.ProjectName}}:{{ .Tag }}-arm64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}-arm64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-arm64
- &arm64v8_linux_image ghcr.io/davidallendj/{{.ProjectName}}:{{ .Tag }}-arm64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}-arm64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-arm64
use: buildx
build_flag_templates:
- "--pull"
@ -112,22 +111,22 @@ dockers:
goarch: arm64
docker_manifests:
- name_template: "ghcr.io/openchami/{{.ProjectName}}:latest"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:latest"
image_templates:
- *amd64_linux_image
- *arm64v7_linux_image
- name_template: "ghcr.io/openchami/{{.ProjectName}}:{{ .Tag }}"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:{{ .Tag }}"
image_templates:
- *amd64_linux_image
- *arm64v7_linux_image
- name_template: "ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}"
image_templates:
- *amd64_linux_image
- *arm64v7_linux_image
- name_template: "ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}"
image_templates:
- *amd64_linux_image
- *arm64v7_linux_image

View file

@ -156,7 +156,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Miscellaneous
* Merge pull request #55 from OpenCHAMI/cacert-hotfix
* Merge pull request #55 from davidallendj/cacert-hotfix
## [0.1.4]
@ -172,11 +172,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Miscellaneous
* Merge branch 'main' into minor-changes
* Merge pull request #50 from OpenCHAMI/container-build
* Merge pull request #51 from OpenCHAMI/minor-changes
* Merge pull request #52 from OpenCHAMI/minor-changes
* Merge pull request #53 from OpenCHAMI/minor-changes
* Merge pull request #54 from OpenCHAMI/update-readme
* Merge pull request #50 from davidallendj/container-build
* Merge pull request #51 from davidallendj/minor-changes
* Merge pull request #52 from davidallendj/minor-changes
* Merge pull request #53 from davidallendj/minor-changes
* Merge pull request #54 from davidallendj/update-readme
* Rearranged collect error to only show when not force updating
* Updated README.md and fixed outdated info
* magellan.sh: remove unused build helper function
@ -211,7 +211,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Miscellaneous
* Merge pull request #49 from OpenCHAMI/add-types
* Merge pull request #49 from davidallendj/add-types
## [0.1.0]
@ -392,7 +392,7 @@ Tidied up CLI flag names
### Added
* Adding dev container to standardize Linux build
* Merge pull request #1 from OpenCHAMI/rehome
* Merge pull request #1 from davidallendj/rehome
## [0.0.5] - 2023-11-02

View file

@ -37,7 +37,7 @@ The `magellan` tool comes packed with a handleful of features for doing discover
- Simple network scanning
- Redfish-based inventory collection
- Redfish-based firmware updating
- Integration with OpenCHAMI SMD
- Integration with davidallendj SMD
- Write inventory data to JSON
- Store and manage BMC secrets
@ -204,9 +204,8 @@ We can then save the output and make a request with the `send` subcommand or pip
--timeout 5 \
--username $USERNAME \
--password $PASSWORD \
--host https://example.openchami.cluster:8443 \
--format yaml \
--output-file nodes.yaml \
--host https://example.davidallendj.cluster:8443 \
--output logs/
--cacert cacert.pem
```
@ -383,7 +382,7 @@ The `magellan` tool has a `login` subcommand that works with the [`opaal`](https
export ACCESS_TOKEN=eyJhbGciOiJIUzI1NiIs...
```
Alternatively, if you are running the OpenCHAMI quickstart in the [deployment recipes](https://github.com/davidallendj/deployment-recipes), you can run the provided script to generate a token and set the environment variable that way.
Alternatively, if you are running the davidallendj quickstart in the [deployment recipes](https://github.com/davidallendj/deployment-recipes), you can run the provided script to generate a token and set the environment variable that way.
```bash
quickstart_dir=path/to/deployment/recipes/quickstart
@ -402,7 +401,7 @@ docker pull ghcr.io/davidallendj/magellan:latest
Then, run either with the helper script found in `bin/magellan.sh` or the binary in the container:
```bash
docker run ghcr.io/openchami/magellan:latest /magellan.sh --scan "--subnet 172.16.0.0 --port 443 --timeout 3" --collect "--user admin --pass password --host http://vm01 --port 27779"
docker run ghcr.io/davidallendj/magellan:latest /magellan.sh --scan "--subnet 172.16.0.0 --port 443 --timeout 3" --collect "--user admin --pass password --host http://vm01 --port 27779"
# ... or ..
docker ghcr.io/openhami/magellan:latest /magellan scan --subnet 172.16.0.0 --subnet-mask 255.255.255.0
```

View file

@ -6,7 +6,7 @@ volumes:
services:
emulator:
image: ghcr.io/openchami/csm-rie:latest
image: davidallendj-rie:latest
container_name: rf-emulator
environment:
BMC_PORT: 5000

View file

@ -8,5 +8,5 @@ if [ ! -d ${script_dir}/rf-emulator ]; then
fi
# build docker image and run with docker compose
docker build -t openchami-rie:latest -f ${script_dir}/Dockerfile ${script_dir}/rf-emulator
docker build -t davidallendj-rie:latest -f ${script_dir}/Dockerfile ${script_dir}/rf-emulator
docker compose -f ${script_dir}/rf-emulator.yml up