Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow ssh-rsa public key type. #140

Merged
merged 5 commits into from
Jul 19, 2023
Merged

Allow ssh-rsa public key type. #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4a5b86c
Allow ssh-rsa public key type.
Gerrit91 Jul 19, 2023
7d6bce9
Remove override.
Gerrit91 Jul 19, 2023
ffcccc7
Update machine images.
Gerrit91 Jul 19, 2023
fdd01c0
Update images.
Gerrit91 Jul 19, 2023
67c6ae7
Add small sleep.
Gerrit91 Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ANSIBLE_EXTRA_VARS_FILE := $(or $(ANSIBLE_EXTRA_VARS_FILE),)
MINI_LAB_FLAVOR := $(or $(MINI_LAB_FLAVOR),default)
MINI_LAB_VM_IMAGE := $(or $(MINI_LAB_VM_IMAGE),ghcr.io/metal-stack/mini-lab-vms:latest)

MACHINE_OS=ubuntu-20.04
MACHINE_OS=ubuntu-22.04

SONIC_REMOTE_IMG := https://sonic-build.azurewebsites.net/api/sonic/artifacts?branchName=master&platform=vs&buildId=125016&target=target%2Fsonic-vs.img.gz

Expand Down Expand Up @@ -50,6 +50,7 @@ up: env control-plane-bake partition-bake
# for some reason an allocated machine will not be able to phone home
# without restarting the metal-core
# TODO: should be investigated and fixed if possible
sleep 10
ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o "PubkeyAcceptedKeyTypes +ssh-rsa" root@leaf01 -i files/ssh/id_rsa 'systemctl restart metal-core'
ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o "PubkeyAcceptedKeyTypes +ssh-rsa" root@leaf02 -i files/ssh/id_rsa 'systemctl restart metal-core'

Expand Down Expand Up @@ -131,7 +132,7 @@ machine: _privatenet

.PHONY: firewall
firewall: _ips _privatenet
$(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_TTY_ARG) metalctl firewall create --description fw --name fw --hostname fw --project 00000000-0000-0000-0000-000000000000 --partition mini-lab --image firewall-ubuntu-2.0 --size v1-small-x86 --networks internet-mini-lab,$(shell $(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_TTY_ARG) metalctl network list --name user-private-network -o template --template '{{ .id }}')
$(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_TTY_ARG) metalctl firewall create --description fw --name fw --hostname fw --project 00000000-0000-0000-0000-000000000000 --partition mini-lab --image firewall-ubuntu-3.0 --size v1-small-x86 --networks internet-mini-lab,$(shell $(DOCKER_COMPOSE) run $(DOCKER_COMPOSE_TTY_ARG) metalctl network list --name user-private-network -o template --template '{{ .id }}')

.PHONY: ls
ls: env
Expand Down
2 changes: 1 addition & 1 deletion ansible.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ force_valid_group_names = ignore
[ssh_connection]
retries=3
ssh_executable = /usr/bin/ssh
ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s -o StrictHostKeyChecking=no
ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s -o StrictHostKeyChecking=no -o PubkeyAcceptedKeyTypes=+ssh-rsa
pipelining = True
16 changes: 8 additions & 8 deletions inventories/group_vars/control-plane/metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ metal_api_admin_key: metal-admin
metal_api_nsq_tcp_address: nsqd:4150

metal_api_images:
- id: firewall-ubuntu-2.0.20230110
name: Firewall 2 Ubuntu 20230110
description: Firewall 2 Ubuntu 20230110
url: http://images.metal-stack.io/metal-os/firewall/2.0-ubuntu/20230110/img.tar.lz4
- id: firewall-ubuntu-3.0.20230710
name: Firewall 3 Ubuntu 20230710
description: Firewall 3 Ubuntu 20230710
url: https://images.metal-stack.io/metal-os/20230710/firewall/3.0-ubuntu/img.tar.lz4
features:
- firewall
- id: ubuntu-20.04.20230110
name: Ubuntu 20.04 20230110
description: Ubuntu 20.04 20230110
url: http://images.metal-stack.io/metal-os/ubuntu/20.04/20230110/img.tar.lz4
- id: ubuntu-22.04.20230710
name: Ubuntu 22.04 20230710
description: Ubuntu 22.04 20230710
url: https://images.metal-stack.io/metal-os/20230710/ubuntu/22.04/img.tar.lz4
features:
- machine

Expand Down