Commit 5d70d916 authored by Brian Kocoloski's avatar Brian Kocoloski
Browse files

misc updates

parent 438cf432
......@@ -82,10 +82,19 @@ First download the Merge CLI `mrg` for the operating system and CPU architecture
| Operating System | Architecture | Download Link |
| ---------------- | ------------ | ------------- |
| Linux | x86_64 | <a href="https://gitlab.com/mergetb/portal/cli/-/jobs/artifacts/v1.0.5/raw/build/x86_64/linux/mrg?job=build">mrg</a> |
| Linux | arm64 | <a href="https://gitlab.com/mergetb/portal/cli/-/jobs/artifacts/v1.0.5/raw/build/arm64/linux/mrg?job=build">mrg</a> |
| Mac OS | x86_64 | <a href="https://gitlab.com/mergetb/portal/cli/-/jobs/artifacts/v1.0.5/raw/build/x86_64/darwin/mrg?job=build">mrg</a> |
| Mac OS | arm64 | <a href="https://gitlab.com/mergetb/portal/cli/-/jobs/artifacts/v1.0.5/raw/build/arm64/darwin/mrg?job=build">mrg</a> |
| Linux | x86_64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-linux-x86_64">mrg-linux-x86_64</a> |
| Linux | arm64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-linux-arm64">mrg-linux-arm64</a> |
| FreeBSD | x86_64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-freebsd-x86_64">mrg-freebsd-x86_64</a> |
| FreeBSD | arm64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-freebsd-arm64">mrg-freebsd-arm64</a> |
| Mac OS | x86_64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-darwin-x86_64">mrg-darwin-x86_64</a> |
| Mac OS | arm64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-darwin-arm64">mrg-darwin-arm64</a> |
| Windows | x86_64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-windows-x86_64.exe">mrg-windows-x86_64.exe</a> |
| Windows | arm64 | <a href="https://gitlab.com/mergetb/portal/cli/-/releases/permalink/latest/downloads/binaries/mrg-windows-arm64.exe">mrg-windows-arm64.exe</a> |
{{% alert title="Tip" color="info" %}}
The documentation assumes you've downloaded the CLI, made it executable, and renamed it to `mrg`
{{% /alert %}}
### Configuring the API endpoint
......
......@@ -113,10 +113,10 @@ from mergexp import *
# Create a network topology object.
net = Network('hello-world')
# Create two nodes.
# Create three nodes.
a,b,c = [net.node(name) for name in ['a', 'b', 'c']]
# Create a link connecting the two nodes.
# Create a link connecting the three nodes.
link = net.connect([a,b,c])
# Give IP addresses to the nodes on the link just created.
......@@ -124,7 +124,7 @@ link[a].socket.addrs = ip4('10.0.0.1/24')
link[b].socket.addrs = ip4('10.0.0.2/24')
link[c].socket.addrs = ip4('10.0.0.3/24')
# Make this file a runnable experiment based on our two node topology.
# Make this file a runnable experiment based on our three node topology.
experiment(net)
```
......
......@@ -20,7 +20,6 @@ facility up and running.
![](/img/facility/install.png)
The image above depicts the inputs to and outputs from the facility installer. Inputs include:
- The facility XIR model
- A user configuration file
......@@ -308,8 +307,6 @@ total 92
-rw-r--r--. 1 murphy murphy 10306 Jun 8 22:43 mars-config.yml
-rw-r--r--. 1 murphy murphy 1679 Jun 8 22:43 ops_rsa
-rw-r--r--. 1 murphy murphy 381 Jun 8 22:43 ops_rsa.pub
-rw-r--r--. 1 murphy murphy 227 May 20 13:16 spore-key.pem
-rw-r--r--. 1 murphy murphy 611 May 20 13:16 spore.pem
```
## Installing the Facility
......@@ -322,7 +319,7 @@ With `merge-install/` contents in hand, we can now install Merge on our testbed
All testbeds must have at least one operations server running Ground Control. For a complete example
of how to set up an operations server, refer to the Phobos [ops server ansible setup
script](https://gitlab.com/mergetb/devops/vte/phobos/-/blob/main/bootstrap.yml). This example
assumes an operations server running Centos Stream v8, so you may need to make minor updates to
assumes an operations server running Centos Stream 9, so you may need to make minor updates to
support other OS distributions.
[Lines 67-120](https://gitlab.com/mergetb/devops/vte/phobos/-/blob/bjk-dev/bootstrap.yml#L67-120) in
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment