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.

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

WIP: deploy to plc-tst-bsd #11

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ ssh-setup:
if [ ! -f "$(SSH_KEY_FILENAME)" ]; then \
ssh-keygen -t rsa -f "$(SSH_KEY_FILENAME)"; \
fi
ssh-copy-id -i "$(SSH_KEY_FILENAME)" "$(PLC_USERNAME)@$(PLC_IP)"
$(MAKE) ssh SSH_ARGS='echo "Successfully logged in with the key to $(PLC_IP)"'
ssh-copy-id -i "$(SSH_KEY_FILENAME)" "$(PLC_USERNAME)@$(PLC_HOSTNAME)"
$(MAKE) ssh SSH_ARGS='echo "Successfully logged in with the key to $(PLC_HOSTNAME)"'

ssh:
ssh -i "$(SSH_KEY_FILENAME)" "$(PLC_USERNAME)@$(PLC_IP)" $(SSH_ARGS)
ssh -i "$(SSH_KEY_FILENAME)" "$(PLC_USERNAME)@$(PLC_HOSTNAME)" $(SSH_ARGS)

$(PLC_HOST_VARS): Makefile tcbsd-plc.yaml.template
# This substitutes our local environment into ``host_inventory.yaml.template``
Expand Down
3 changes: 3 additions & 0 deletions ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
inventory = ./inventory/
deprecation_warnings = True
role_path = ./roles

[ssh_connection]
ssh_args =
9 changes: 3 additions & 6 deletions group_vars/tcbsd_plcs/vars.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
ansible_user: Administrator
ansible_ssh_private_key_file: /Users/klauer/Repos/twincat-bsd-ansible-testing/tcbsd_key_rsa
ansible_ssh_private_key_file: /cds/home/z/zlentz/github/twincat-bsd-ansible/tcbsd_key_rsa
ansible_become: true
ansible_become_method: doas
ansible_become_password: 1 # TODO: vault
Expand All @@ -17,7 +17,7 @@ tc_locked_memory_size_bytes: 33554432
# Heap memory size is not specified by default. If you wish to change the
# default, set this to greater than 0 (e.g., 1024). This must be
# greater than the locked memory size for the router, above.
tc_heap_memory_size_mb: 0
tc_heap_memory_size_mb: 2048
# Install and use bash in place of sh:
tc_use_bash: true
# Install C/C++ development tools (approximately 1.8GB):
Expand Down Expand Up @@ -91,7 +91,4 @@ tc_uninstall_pip: true
tc_set_fixed_static_routes: []

# Alternatively, only add missing routes from the list:
tc_add_missing_static_routes:
- name: PC98125
address: 192.168.2.110
net_id: 192.168.2.110.1.1
tc_add_missing_static_routes: []
2 changes: 1 addition & 1 deletion inventory/plcs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ plcs:

tcbsd_plcs:
hosts:
test-plc-01:
plc-tst-bsd: