towk/magellan
1
0
Fork 0
mirror of https://github.com/davidallendj/magellan.git synced 2025-12-20 03:27:03 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: updated references

Browse source
This commit is contained in:
David Allen 2024-12-11 10:57:42 -07:00 • committed by David Allen
parent 17fc3ce0dd
commit 6f176767af
Signed by: towk
GPG key ID: 0430CDBE22619155
5 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

51
.goreleaser.yaml
View file

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

16
CHANGELOG.md
View file

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

11
README.md
View file

@ -37,7 +37,7 @@ The `magellan` tool comes packed with a handleful of features for doing discover
- Simple network scanning - Simple network scanning
- Redfish-based inventory collection - Redfish-based inventory collection
- Redfish-based firmware updating - Redfish-based firmware updating
- Integration with OpenCHAMI SMD - Integration with davidallendj SMD
- Write inventory data to JSON - Write inventory data to JSON
- Store and manage BMC secrets - 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 \ --timeout 5 \
--username $USERNAME \ --username $USERNAME \
--password $PASSWORD \ --password $PASSWORD \
--host https://example.openchami.cluster:8443 \ --host https://example.davidallendj.cluster:8443 \
--format yaml \ --output logs/
--output-file nodes.yaml \
--cacert cacert.pem --cacert cacert.pem
``` ```
@ -383,7 +382,7 @@ The `magellan` tool has a `login` subcommand that works with the [`opaal`](https
export ACCESS_TOKEN=eyJhbGciOiJIUzI1NiIs... 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 ```bash
quickstart_dir=path/to/deployment/recipes/quickstart 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: Then, run either with the helper script found in `bin/magellan.sh` or the binary in the container:
```bash ```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 .. # ... or ..
docker ghcr.io/openhami/magellan:latest /magellan scan --subnet 172.16.0.0 --subnet-mask 255.255.255.0 docker ghcr.io/openhami/magellan:latest /magellan scan --subnet 172.16.0.0 --subnet-mask 255.255.255.0
``` ```

2
emulator/rf-emulator.yml
View file

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

2
emulator/setup.sh
View file

@ -8,5 +8,5 @@ if [ ! -d ${script_dir}/rf-emulator ]; then
fi fi
# build docker image and run with docker compose # 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 docker compose -f ${script_dir}/rf-emulator.yml up