aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
Diffstat (limited to 'ansible')
-rw-r--r--ansible/ansible.cfg6
-rw-r--r--ansible/connection_plugins/lxc_ssh.py1259
-rw-r--r--ansible/group_vars/all/bird.yml3
-rw-r--r--ansible/group_vars/all/ipam.yml101
-rw-r--r--ansible/host_vars/danneri/systemd-networkd.yml2
-rw-r--r--ansible/host_vars/hash/roa-server.vault.yml19
-rw-r--r--ansible/host_vars/lhn2pi/all.yml2
-rw-r--r--ansible/inventory16
-rw-r--r--ansible/plays/danneri.yml23
-rw-r--r--ansible/plays/host-hash.yml10
-rw-r--r--ansible/plays/host-lhn2pi.yml6
-rw-r--r--ansible/plays/ipam-generate-dns.yml32
-rw-r--r--ansible/plays/ipam-generate-tf.yml53
-rw-r--r--ansible/plays/roa-server.yml25
-rw-r--r--ansible/plays/templates/danneri/systemd-networkd/enp1s0.network8
-rw-r--r--ansible/plays/templates/lhn2pi/systemd/network/10-eth0.network11
-rw-r--r--ansible/plays/templates/roa-server/docker-compose.yml14
-rw-r--r--ansible/prometheus/deploy-config.yml19
-rw-r--r--ansible/prometheus/files/conflatorio/prometheus.yml25
-rw-r--r--ansible/roles/prometheus-bird-exporter/handlers/main.yml5
-rw-r--r--ansible/roles/prometheus-bird-exporter/tasks/main.yml18
-rw-r--r--ansible/roles/prometheus-node-exporter/handlers/main.yml5
-rw-r--r--ansible/roles/prometheus-node-exporter/tasks/main.yml18
-rw-r--r--ansible/roles/systemd-networkd/handlers/main.yml5
-rw-r--r--ansible/roles/systemd-networkd/tasks/main.yml17
-rw-r--r--ansible/wg0/files/coregonus/etc/wireguard/public-wg0.key1
-rw-r--r--ansible/wg0/group_vars/all/wireguard_wg0.yml7
-rw-r--r--ansible/wg0/wireguard-wg0-terraform.yml3
28 files changed, 442 insertions, 1271 deletions
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
index 6da8010..2190846 100644
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@@ -1,6 +1,5 @@
[defaults]
become_method = sudo
-connection_plugins = ./connection_plugins
inventory = ./inventory
#,./inventory-terraform
nocows = True
@@ -8,3 +7,8 @@ stdout_callback = debug
vault_password_file = ./.vault-password
roles_path = roles:thirdparty
retry_files_enabled = False
+vars_plugins_enabled = host_group_vars,community.sops.sops
+
+[ssh_connection]
+pipelining = True
+ssh_args = -o ControlMaster=auto -o ControlPersist=1200
diff --git a/ansible/connection_plugins/lxc_ssh.py b/ansible/connection_plugins/lxc_ssh.py
deleted file mode 100644
index 2bb5352..0000000
--- a/ansible/connection_plugins/lxc_ssh.py
+++ /dev/null
@@ -1,1259 +0,0 @@
-# Copyright 2016 Pierre Chifflier <pollux@wzdftpd.net>
-#
-# SSH + lxc-attach connection module for Ansible 2.0
-#
-# Adapted from ansible/plugins/connection/ssh.py
-# Forked from https://github.com/chifflier/ansible-lxc-ssh
-# Hosted on https://github.com/andreasscherbaum/ansible-lxc-ssh
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
-#
-import errno
-import fcntl
-import hashlib
-import os
-import pipes
-import pty
-import shlex
-import subprocess
-import sys
-from distutils.version import LooseVersion
-
-from ansible.release import __version__ as ansible_version
-if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- from functools import wraps
-from ansible import constants as C
-if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- from ansible.compat.six import text_type, binary_type
- from ansible.errors import AnsibleConnectionFailure, AnsibleError
- from ansible.plugins.connection import ConnectionBase
-if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- from ansible.errors import AnsibleError, AnsibleConnectionFailure, AnsibleFileNotFound
- from ansible.errors import AnsibleOptionsError
- from ansible.compat import selectors
- from ansible.module_utils.six import PY3, text_type, binary_type
- if LooseVersion(ansible_version) < LooseVersion('2.4.0.0'):
- from ansible.compat.six.moves import shlex_quote
- else:
- from ansible.module_utils.six.moves import shlex_quote
- from ansible.module_utils._text import to_bytes, to_native, to_text
- if LooseVersion(ansible_version) >= LooseVersion('2.4.0.0'):
- from ansible.module_utils.parsing.convert_bool import BOOLEANS, boolean
- from ansible.plugins.connection import ConnectionBase, BUFSIZE
-from ansible.utils.path import unfrackpath, makedirs_safe
-
-if LooseVersion(ansible_version) >= LooseVersion('2.2.0.0'):
- from ansible.module_utils._text import to_bytes, to_text as to_unicode, to_native as to_str
-else:
- from ansible.utils.unicode import to_bytes, to_unicode, to_str
-
-try:
- from __main__ import display
-except ImportError:
- from ansible.utils.display import Display
- display = Display()
-
-if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- import select
-
-
-# only used from Ansible version 2.3 on forward
-class AnsibleControlPersistBrokenPipeError(AnsibleError):
- ''' ControlPersist broken pipe '''
- pass
-
-
-def _ssh_retry(func):
- """
- Decorator to retry ssh/scp/sftp in the case of a connection failure
-
- Will retry if:
- * an exception is caught
- * ssh returns 255
- Will not retry if
- * remaining_tries is <2
- * retries limit reached
- """
- @wraps(func)
- def wrapped(self, *args, **kwargs):
- remaining_tries = int(C.ANSIBLE_SSH_RETRIES) + 1
- cmd_summary = "%s..." % args[0]
- for attempt in range(remaining_tries):
- cmd = args[0]
- if attempt != 0 and self._play_context.password and isinstance(cmd, list):
- # If this is a retry, the fd/pipe for sshpass is closed, and we need a new one
- self.sshpass_pipe = os.pipe()
- cmd[1] = b'-d' + to_bytes(self.sshpass_pipe[0], nonstring='simplerepr', errors='surrogate_or_strict')
-
- try:
- try:
- return_tuple = func(self, *args, **kwargs)
- display.vvv(return_tuple, host=self.host)
- # 0 = success
- # 1-254 = remote command return code
- # 255 = failure from the ssh command itself
- except (AnsibleControlPersistBrokenPipeError) as e:
- # Retry one more time because of the ControlPersist broken pipe (see #16731)
- display.vvv(u"RETRYING BECAUSE OF CONTROLPERSIST BROKEN PIPE")
- return_tuple = func(self, *args, **kwargs)
-
- if return_tuple[0] != 255:
- break
- else:
- raise AnsibleConnectionFailure("Failed to connect to the host via ssh: %s" % to_native(return_tuple[2]))
- except (AnsibleConnectionFailure, Exception) as e:
- if attempt == remaining_tries - 1:
- raise
- else:
- pause = 2 ** attempt - 1
- if pause > 30:
- pause = 30
-
- if isinstance(e, AnsibleConnectionFailure):
- msg = "ssh_retry: attempt: %d, ssh return code is 255. cmd (%s), pausing for %d seconds" % (attempt, cmd_summary, pause)
- else:
- msg = "ssh_retry: attempt: %d, caught exception(%s) from cmd (%s), pausing for %d seconds" % (attempt, e, cmd_summary, pause)
-
- display.vv(msg, host=self.host)
-
- time.sleep(pause)
- continue
-
- return return_tuple
- return wrapped
-
-
-class Connection(ConnectionBase):
- ''' ssh+lxc_attach connection '''
- transport = 'lxc_ssh'
-
- def __init__(self, play_context, new_stdin, *args, **kwargs):
- #print args
- #print kwargs
- super(Connection, self).__init__(play_context, new_stdin, *args, **kwargs)
- self.host = self._play_context.remote_addr
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- self.port = self._play_context.port
- self.user = self._play_context.remote_user
- self.control_path = C.ANSIBLE_SSH_CONTROL_PATH
- self.control_path_dir = C.ANSIBLE_SSH_CONTROL_PATH_DIR
- self.lxc_version = None
-
- # LXC v1 uses 'lxc-info', 'lxc-attach' and so on
- # LXC v2 uses just 'lxc'
- (returncode2, stdout2, stderr2) = self._exec_command("which lxc", None, False)
- (returncode1, stdout1, stderr1) = self._exec_command("which lxc-info", None, False)
- if (returncode2 == 0):
- self.lxc_version = 2
- display.vvv('LXC v2')
- elif (returncode1 == 0):
- self.lxc_version = 1
- display.vvv('LXC v1')
- else:
- raise AnsibleConnectionFailure('Cannot identify LXC version')
- sys.exit(1)
-
-
- # The connection is created by running ssh/scp/sftp from the exec_command,
- # put_file, and fetch_file methods, so we don't need to do any connection
- # management here.
- def _connect(self):
- ''' connect to the lxc; nothing to do here '''
- display.vvv('XXX connect')
- super(Connection, self)._connect()
- #self.container_name = self.ssh._play_context.remote_addr
- self.container_name = self._play_context.ssh_extra_args # XXX
- #self.container = None
-
-
- # only used from Ansible version 2.3 on forward
- @staticmethod
- def _create_control_path(host, port, user, connection=None):
- '''Make a hash for the controlpath based on con attributes'''
- pstring = '%s-%s-%s' % (host, port, user)
- if connection:
- pstring += '-%s' % connection
- m = hashlib.sha1()
- m.update(to_bytes(pstring))
- digest = m.hexdigest()
- cpath = '%(directory)s/' + digest[:10]
- return cpath
-
-
- @staticmethod
- def _persistence_controls(b_command):
- '''
- Takes a command array and scans it for ControlPersist and ControlPath
- settings and returns two booleans indicating whether either was found.
- This could be smarter, e.g. returning false if ControlPersist is 'no',
- but for now we do it simple way.
- '''
-
- controlpersist = False
- controlpath = False
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- for arg in b_command:
- if 'controlpersist' in arg.lower():
- controlpersist = True
- elif 'controlpath' in arg.lower():
- controlpath = True
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- for b_arg in (a.lower() for a in b_command):
- if b'controlpersist' in b_arg:
- controlpersist = True
- elif b'controlpath' in b_arg:
- controlpath = True
-
- return controlpersist, controlpath
-
-
- @staticmethod
- def _split_args(argstring):
- """
- Takes a string like '-o Foo=1 -o Bar="foo bar"' and returns a
- list ['-o', 'Foo=1', '-o', 'Bar=foo bar'] that can be added to
- the argument list. The list will not contain any empty elements.
- """
- return [to_unicode(x.strip()) for x in shlex.split(to_bytes(argstring)) if x.strip()]
-
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- def _add_args(self, explanation, args):
- """
- Adds the given args to self._command and displays a caller-supplied
- explanation of why they were added.
- """
- self._command += args
- display.vvvvv('SSH: ' + explanation + ': (%s)' % ')('.join(args), host=self._play_context.remote_addr)
-
-
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- def _add_args(self, b_command, b_args, explanation):
- """
- Adds arguments to the ssh command and displays a caller-supplied explanation of why.
- :arg b_command: A list containing the command to add the new arguments to.
- This list will be modified by this method.
- :arg b_args: An iterable of new arguments to add. This iterable is used
- more than once so it must be persistent (ie: a list is okay but a
- StringIO would not)
- :arg explanation: A text string containing explaining why the arguments
- were added. It will be displayed with a high enough verbosity.
- .. note:: This function does its work via side-effect. The b_command list has the new arguments appended.
- """
- display.vvvvv(u'SSH: %s: (%s)' % (explanation, ')('.join(to_text(a) for a in b_args)), host=self._play_context.remote_addr)
- b_command += b_args
-
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- def _build_command(self, binary, *other_args):
- self._command = []
- self._command += [binary]
- self._command += ['-C']
- if self._play_context.verbosity > 3:
- self._command += ['-vvv']
- elif binary == 'ssh':
- # Older versions of ssh (e.g. in RHEL 6) don't accept sftp -q.
- self._command += ['-q']
- # Next, we add [ssh_connection]ssh_args from ansible.cfg.
- if self._play_context.ssh_args:
- args = self._split_args(self._play_context.ssh_args)
- self._add_args("ansible.cfg set ssh_args", args)
- # Now we add various arguments controlled by configuration file settings
- # (e.g. host_key_checking) or inventory variables (ansible_ssh_port) or
- # a combination thereof.
- if not C.HOST_KEY_CHECKING:
- self._add_args(
- "ANSIBLE_HOST_KEY_CHECKING/host_key_checking disabled",
- ("-o", "StrictHostKeyChecking=no")
- )
- if self._play_context.port is not None:
- self._add_args(
- "ANSIBLE_REMOTE_PORT/remote_port/ansible_port set",
- ("-o", "Port={0}".format(self._play_context.port))
- )
- key = self._play_context.private_key_file
- if key:
- self._add_args(
- "ANSIBLE_PRIVATE_KEY_FILE/private_key_file/ansible_ssh_private_key_file set",
- ("-o", "IdentityFile=\"{0}\"".format(os.path.expanduser(key)))
- )
- if not self._play_context.password:
- self._add_args(
- "ansible_password/ansible_ssh_pass not set", (
- "-o", "KbdInteractiveAuthentication=no",
- "-o", "PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey",
- "-o", "PasswordAuthentication=no"
- )
- )
- user = self._play_context.remote_user
- if user:
- self._add_args(
- "ANSIBLE_REMOTE_USER/remote_user/ansible_user/user/-u set",
- ("-o", "User={0}".format(to_bytes(self._play_context.remote_user)))
- )
- self._add_args(
- "ANSIBLE_TIMEOUT/timeout set",
- ("-o", "ConnectTimeout={0}".format(self._play_context.timeout))
- )
- # Check if ControlPersist is enabled and add a ControlPath if one hasn't
- # already been set.
- controlpersist, controlpath = self._persistence_controls(self._command)
- if controlpersist:
- self._persistent = True
- if not controlpath:
- cpdir = unfrackpath('$HOME/.ansible/cp')
- display.vv(str(C.ANSIBLE_SSH_CONTROL_PATH))
- # The directory must exist and be writable.
- makedirs_safe(cpdir, 0o700)
- if not os.access(cpdir, os.W_OK):
- raise AnsibleError("Cannot write to ControlPath %s" % cpdir)
- args = ("-o", "ControlPath={0}".format(
- to_bytes(C.ANSIBLE_SSH_CONTROL_PATH % dict(directory=cpdir)))
- )
- self._add_args("found only ControlPersist; added ControlPath", args)
- ## Finally, we add any caller-supplied extras.
- if other_args:
- self._command += other_args
- return self._command
-
-
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- def _build_command(self, binary, *other_args):
- b_command = []
- if binary == 'ssh':
- b_command += [to_bytes(self._play_context.ssh_executable, errors='surrogate_or_strict')]
- else:
- b_command += [to_bytes(binary, errors='surrogate_or_strict')]
- if self._play_context.verbosity > 3:
- b_command.append(b'-vvv')
- # Next, we add [ssh_connection]ssh_args from ansible.cfg.
- #
- if self._play_context.ssh_args:
- b_args = [to_bytes(a, errors='surrogate_or_strict') for a in
- self._split_args(self._play_context.ssh_args)]
- self._add_args(b_command, b_args, u"ansible.cfg set ssh_args")
-
- # Now we add various arguments controlled by configuration file settings
- # (e.g. host_key_checking) or inventory variables (ansible_ssh_port) or
- # a combination thereof.
- if not C.HOST_KEY_CHECKING:
- b_args = (b"-o", b"StrictHostKeyChecking=no")
- self._add_args(b_command, b_args, u"ANSIBLE_HOST_KEY_CHECKING/host_key_checking disabled")
- if self._play_context.port is not None:
- b_args = (b"-o", b"Port=" + to_bytes(self._play_context.port, nonstring='simplerepr', errors='surrogate_or_strict'))
- self._add_args(b_command, b_args, u"ANSIBLE_REMOTE_PORT/remote_port/ansible_port set")
- key = self._play_context.private_key_file
- if key:
- b_args = (b"-o", b'IdentityFile="' + to_bytes(os.path.expanduser(key), errors='surrogate_or_strict') + b'"')
- self._add_args(b_command, b_args, u"ANSIBLE_PRIVATE_KEY_FILE/private_key_file/ansible_ssh_private_key_file set")
- if not self._play_context.password:
- self._add_args(
- b_command, (
- b"-o", b"KbdInteractiveAuthentication=no",
- b"-o", b"PreferredAuthentications=gssapi-with-mic,gssapi-keyex,hostbased,publickey",
- b"-o", b"PasswordAuthentication=no"
- ),
- u"ansible_password/ansible_ssh_pass not set"
- )
- user = self._play_context.remote_user
- if user:
- self._add_args(
- b_command,
- (b"-o", b"User=" + to_bytes(self._play_context.remote_user, errors='surrogate_or_strict')),
- u"ANSIBLE_REMOTE_USER/remote_user/ansible_user/user/-u set"
- )
- self._add_args(
- b_command,
- (b"-o", b"ConnectTimeout=" + to_bytes(self._play_context.timeout, errors='surrogate_or_strict', nonstring='simplerepr')),
- u"ANSIBLE_TIMEOUT/timeout set"
- )
- # Check if ControlPersist is enabled and add a ControlPath if one hasn't
- # already been set.
- controlpersist, controlpath = self._persistence_controls(b_command)
- if controlpersist:
- self._persistent = True
- if not controlpath:
- cpdir = unfrackpath(self.control_path_dir)
- b_cpdir = to_bytes(cpdir, errors='surrogate_or_strict')
- # The directory must exist and be writable.
- makedirs_safe(b_cpdir, 0o700)
- if not os.access(b_cpdir, os.W_OK):
- raise AnsibleError("Cannot write to ControlPath %s" % to_native(cpdir))
-
- if not self.control_path:
- self.control_path = self._create_control_path(
- self.host,
- self.port,
- self.user
- )
- b_args = (b"-o", b"ControlPath=" + to_bytes(self.control_path % dict(directory=cpdir), errors='surrogate_or_strict'))
- self._add_args(b_command, b_args, u"found only ControlPersist; added ControlPath")
-
- # Finally, we add any caller-supplied extras.
- if other_args:
- b_command += [to_bytes(a) for a in other_args]
-
- return b_command
-
-
- def _send_initial_data(self, fh, in_data):
- '''
- Writes initial data to the stdin filehandle of the subprocess and closes
- it. (The handle must be closed; otherwise, for example, "sftp -b -" will
- just hang forever waiting for more commands.)
- '''
-
- display.debug('Sending initial data')
-
- try:
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- fh.write(in_data)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- fh.write(to_bytes(in_data))
- fh.close()
- except (OSError, IOError):
- raise AnsibleConnectionFailure('SSH Error: data could not be sent to remote host "%s". Make sure this host can be reached over ssh' % self.host)
-
- display.debug('Sent initial data (%d bytes)' % len(in_data))
-
-
- # Used by _run() to kill processes on failures
- @staticmethod
- def _terminate_process(p):
- """ Terminate a process, ignoring errors """
- try:
- p.terminate()
- except (OSError, IOError):
- pass
-
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- # This is separate from _run() because we need to do the same thing for stdout
- # and stderr.
- def _examine_output(self, source, state, chunk, sudoable):
- '''
- Takes a string, extracts complete lines from it, tests to see if they
- are a prompt, error message, etc., and sets appropriate flags in self.
- Prompt and success lines are removed.
-
- Returns the processed (i.e. possibly-edited) output and the unprocessed
- remainder (to be processed with the next chunk) as strings.
- '''
-
- output = []
- for l in chunk.splitlines(True):
- suppress_output = False
-
- #display.debug("Examining line (source=%s, state=%s): '%s'" % (source, state, l.rstrip('\r\n')))
- if self._play_context.prompt and self.check_password_prompt(l):
- display.debug("become_prompt: (source=%s, state=%s): '%s'" % (source, state, l.rstrip('\r\n')))
- self._flags['become_prompt'] = True
- suppress_output = True
- elif self._play_context.success_key and self.check_become_success(l):
- display.debug("become_success: (source=%s, state=%s): '%s'" % (source, state, l.rstrip('\r\n')))
- self._flags['become_success'] = True
- suppress_output = True
- elif sudoable and self.check_incorrect_password(l):
- display.debug("become_error: (source=%s, state=%s): '%s'" % (source, state, l.rstrip('\r\n')))
- self._flags['become_error'] = True
- elif sudoable and self.check_missing_password(l):
- display.debug("become_nopasswd_error: (source=%s, state=%s): '%s'" % (source, state, l.rstrip('\r\n')))
- self._flags['become_nopasswd_error'] = True
-
- if not suppress_output:
- output.append(l)
-
- # The chunk we read was most likely a series of complete lines, but just
- # in case the last line was incomplete (and not a prompt, which we would
- # have removed from the output), we retain it to be processed with the
- # next chunk.
-
- remainder = ''
- if output and not output[-1].endswith('\n'):
- remainder = output[-1]
- output = output[:-1]
-
- return ''.join(output), remainder
-
-
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- # This is separate from _run() because we need to do the same thing for stdout
- # and stderr.
- def _examine_output(self, source, state, b_chunk, sudoable):
- '''
- Takes a string, extracts complete lines from it, tests to see if they
- are a prompt, error message, etc., and sets appropriate flags in self.
- Prompt and success lines are removed.
- Returns the processed (i.e. possibly-edited) output and the unprocessed
- remainder (to be processed with the next chunk) as strings.
- '''
-
- output = []
- for b_line in b_chunk.splitlines(True):
- display_line = to_text(b_line).rstrip('\r\n')
- suppress_output = False
-
- # display.debug("Examining line (source=%s, state=%s): '%s'" % (source, state, display_line))
- if self._play_context.prompt and self.check_password_prompt(b_line):
- display.debug("become_prompt: (source=%s, state=%s): '%s'" % (source, state, display_line))
- self._flags['become_prompt'] = True
- suppress_output = True
- elif self._play_context.success_key and self.check_become_success(b_line):
- display.debug("become_success: (source=%s, state=%s): '%s'" % (source, state, display_line))
- self._flags['become_success'] = True
- suppress_output = True
- elif sudoable and self.check_incorrect_password(b_line):
- display.debug("become_error: (source=%s, state=%s): '%s'" % (source, state, display_line))
- self._flags['become_error'] = True
- elif sudoable and self.check_missing_password(b_line):
- display.debug("become_nopasswd_error: (source=%s, state=%s): '%s'" % (source, state, display_line))
- self._flags['become_nopasswd_error'] = True
-
- if not suppress_output:
- output.append(b_line)
-
- # The chunk we read was most likely a series of complete lines, but just
- # in case the last line was incomplete (and not a prompt, which we would
- # have removed from the output), we retain it to be processed with the
- # next chunk.
-
- remainder = b''
- if output and not output[-1].endswith(b'\n'):
- remainder = output[-1]
- output = output[:-1]
-
- return b''.join(output), remainder
-
-
- # only used from Ansible version 2.3 on forward
- def _bare_run(self, cmd, in_data, sudoable=True, checkrc=True):
- '''
- Starts the command and communicates with it until it ends.
- '''
-
- display_cmd = list(map(shlex_quote, map(to_text, cmd)))
- display.vvv(u'SSH: EXEC {0}'.format(u' '.join(display_cmd)), host=self.host)
-
- # Start the given command. If we don't need to pipeline data, we can try
- # to use a pseudo-tty (ssh will have been invoked with -tt). If we are
- # pipelining data, or can't create a pty, we fall back to using plain
- # old pipes.
-
- p = None
-
- if isinstance(cmd, (text_type, binary_type)):
- cmd = to_bytes(cmd)
- else:
- cmd = map(to_bytes, cmd)
-
- if not in_data:
- try:
- # Make sure stdin is a proper pty to avoid tcgetattr errors
- master, slave = pty.openpty()
- if PY3 and self._play_context.password:
- p = subprocess.Popen(cmd, stdin=slave, stdout=subprocess.PIPE, stderr=subprocess.PIPE, pass_fds=self.sshpass_pipe)
- else:
- p = subprocess.Popen(cmd, stdin=slave, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- stdin = os.fdopen(master, 'wb', 0)
- os.close(slave)
- except (OSError, IOError):
- p = None
-
- if not p:
- if PY3 and self._play_context.password:
- p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, pass_fds=self.sshpass_pipe)
- else:
- p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- stdin = p.stdin
-
- # If we are using SSH password authentication, write the password into
- # the pipe we opened in _build_command.
-
- if self._play_context.password:
- os.close(self.sshpass_pipe[0])
- try:
- os.write(self.sshpass_pipe[1], to_bytes(self._play_context.password) + b'\n')
- except OSError as e:
- # Ignore broken pipe errors if the sshpass process has exited.
- if e.errno != errno.EPIPE or p.poll() is None:
- raise
- os.close(self.sshpass_pipe[1])
-
- #
- # SSH state machine
- #
-
- # Now we read and accumulate output from the running process until it
- # exits. Depending on the circumstances, we may also need to write an
- # escalation password and/or pipelined input to the process.
-
- states = [
- 'awaiting_prompt', 'awaiting_escalation', 'ready_to_send', 'awaiting_exit'
- ]
-
- # Are we requesting privilege escalation? Right now, we may be invoked
- # to execute sftp/scp with sudoable=True, but we can request escalation
- # only when using ssh. Otherwise we can send initial data straightaway.
-
- state = states.index('ready_to_send')
- if b'ssh' in cmd:
- if self._play_context.prompt:
- # We're requesting escalation with a password, so we have to
- # wait for a password prompt.
- state = states.index('awaiting_prompt')
- display.debug(u'Initial state: %s: %s' % (states[state], self._play_context.prompt))
- elif self._play_context.become and self._play_context.success_key:
- # We're requesting escalation without a password, so we have to
- # detect success/failure before sending any initial data.
- state = states.index('awaiting_escalation')
- display.debug(u'Initial state: %s: %s' % (states[state], self._play_context.success_key))
-
- # We store accumulated stdout and stderr output from the process here,
- # but strip any privilege escalation prompt/confirmation lines first.
- # Output is accumulated into tmp_*, complete lines are extracted into
- # an array, then checked and removed or copied to stdout or stderr. We
- # set any flags based on examining the output in self._flags.
-
- b_stdout = b_stderr = b''
- b_tmp_stdout = b_tmp_stderr = b''
-
- self._flags = dict(
- become_prompt=False, become_success=False,
- become_error=False, become_nopasswd_error=False
- )
-
- # select timeout should be longer than the connect timeout, otherwise
- # they will race each other when we can't connect, and the connect
- # timeout usually fails
- timeout = 2 + self._play_context.timeout
- for fd in (p.stdout, p.stderr):
- fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK)
-
- # TODO: bcoca would like to use SelectSelector() when open
- # filehandles is low, then switch to more efficient ones when higher.
- # select is faster when filehandles is low.
- selector = selectors.DefaultSelector()
- selector.register(p.stdout, selectors.EVENT_READ)
- selector.register(p.stderr, selectors.EVENT_READ)
-
- # If we can send initial data without waiting for anything, we do so
- # before we start polling
- if states[state] == 'ready_to_send' and in_data:
- self._send_initial_data(stdin, in_data)
- state += 1
-
- try:
- while True:
- poll = p.poll()
- events = selector.select(timeout)
-
- # We pay attention to timeouts only while negotiating a prompt.
-
- if not events:
- # We timed out
- if state <= states.index('awaiting_escalation'):
- # If the process has already exited, then it's not really a
- # timeout; we'll let the normal error handling deal with it.
- if poll is not None:
- break
- self._terminate_process(p)
- raise AnsibleError('Timeout (%ds) waiting for privilege escalation prompt: %s' % (timeout, to_native(b_stdout)))
-
- # Read whatever output is available on stdout and stderr, and stop
- # listening to the pipe if it's been closed.
-
- for key, event in events:
- if key.fileobj == p.stdout:
- b_chunk = p.stdout.read()
- if b_chunk == b'':
- # stdout has been closed, stop watching it
- selector.unregister(p.stdout)
- # When ssh has ControlMaster (+ControlPath/Persist) enabled, the
- # first connection goes into the background and we never see EOF
- # on stderr. If we see EOF on stdout, lower the select timeout
- # to reduce the time wasted selecting on stderr if we observe
- # that the process has not yet existed after this EOF. Otherwise
- # we may spend a long timeout period waiting for an EOF that is
- # not going to arrive until the persisted connection closes.
- timeout = 1
- b_tmp_stdout += b_chunk
- display.debug("stdout chunk (state=%s):\n>>>%s<<<\n" % (state, to_text(b_chunk)))
- elif key.fileobj == p.stderr:
- b_chunk = p.stderr.read()
- if b_chunk == b'':
- # stderr has been closed, stop watching it
- selector.unregister(p.stderr)
- b_tmp_stderr += b_chunk
- display.debug("stderr chunk (state=%s):\n>>>%s<<<\n" % (state, to_text(b_chunk)))
-
- # We examine the output line-by-line until we have negotiated any
- # privilege escalation prompt and subsequent success/error message.
- # Afterwards, we can accumulate output without looking at it.
-
- if state < states.index('ready_to_send'):
- if b_tmp_stdout:
- b_output, b_unprocessed = self._examine_output('stdout', states[state], b_tmp_stdout, sudoable)
- b_stdout += b_output
- b_tmp_stdout = b_unprocessed
-
- if b_tmp_stderr:
- b_output, b_unprocessed = self._examine_output('stderr', states[state], b_tmp_stderr, sudoable)
- b_stderr += b_output
- b_tmp_stderr = b_unprocessed
- else:
- b_stdout += b_tmp_stdout
- b_stderr += b_tmp_stderr
- b_tmp_stdout = b_tmp_stderr = b''
-
- # If we see a privilege escalation prompt, we send the password.
- # (If we're expecting a prompt but the escalation succeeds, we
- # didn't need the password and can carry on regardless.)
-
- if states[state] == 'awaiting_prompt':
- if self._flags['become_prompt']:
- display.debug('Sending become_pass in response to prompt')
- stdin.write(to_bytes(self._play_context.become_pass) + b'\n')
- self._flags['become_prompt'] = False
- state += 1
- elif self._flags['become_success']:
- state += 1
-
- # We've requested escalation (with or without a password), now we
- # wait for an error message or a successful escalation.
-
- if states[state] == 'awaiting_escalation':
- if self._flags['become_success']:
- display.debug('Escalation succeeded')
- self._flags['become_success'] = False
- state += 1
- elif self._flags['become_error']:
- display.debug('Escalation failed')
- self._terminate_process(p)
- self._flags['become_error'] = False
- raise AnsibleError('Incorrect %s password' % self._play_context.become_method)
- elif self._flags['become_nopasswd_error']:
- display.debug('Escalation requires password')
- self._terminate_process(p)
- self._flags['become_nopasswd_error'] = False
- raise AnsibleError('Missing %s password' % self._play_context.become_method)
- elif self._flags['become_prompt']:
- # This shouldn't happen, because we should see the "Sorry,
- # try again" message first.
- display.debug('Escalation prompt repeated')
- self._terminate_process(p)
- self._flags['become_prompt'] = False
- raise AnsibleError('Incorrect %s password' % self._play_context.become_method)
-
- # Once we're sure that the privilege escalation prompt, if any, has
- # been dealt with, we can send any initial data and start waiting
- # for output.
-
- if states[state] == 'ready_to_send':
- if in_data:
- self._send_initial_data(stdin, in_data)
- state += 1
-
- # Now we're awaiting_exit: has the child process exited? If it has,
- # and we've read all available output from it, we're done.
-
- if poll is not None:
- if not selector.get_map() or not events:
- break
- # We should not see further writes to the stdout/stderr file
- # descriptors after the process has closed, set the select
- # timeout to gather any last writes we may have missed.
- timeout = 0
- continue
-
- # If the process has not yet exited, but we've already read EOF from
- # its stdout and stderr (and thus no longer watching any file
- # descriptors), we can just wait for it to exit.
-
- elif not selector.get_map():
- p.wait()
- break
-
- # Otherwise there may still be outstanding data to read.
- finally:
- selector.close()
- # close stdin after process is terminated and stdout/stderr are read
- # completely (see also issue #848)
- stdin.close()
-
- if C.HOST_KEY_CHECKING:
- if cmd[0] == b"sshpass" and p.returncode == 6:
- raise AnsibleError('Using a SSH password instead of a key is not possible because Host Key checking is enabled and sshpass does not support '
- 'this. Please add this host\'s fingerprint to your known_hosts file to manage this host.')
-
- controlpersisterror = b'Bad configuration option: ControlPersist' in b_stderr or b'unknown configuration option: ControlPersist' in b_stderr
- if p.returncode != 0 and controlpersisterror:
- raise AnsibleError('using -c ssh on certain older ssh versions may not support ControlPersist, set ANSIBLE_SSH_ARGS="" '
- '(or ssh_args in [ssh_connection] section of the config file) before running again')
-
- # If we find a broken pipe because of ControlPersist timeout expiring (see #16731),
- # we raise a special exception so that we can retry a connection.
- controlpersist_broken_pipe = b'mux_client_hello_exchange: write packet: Broken pipe' in b_stderr
- if p.returncode == 255 and controlpersist_broken_pipe:
- raise AnsibleControlPersistBrokenPipeError('SSH Error: data could not be sent because of ControlPersist broken pipe.')
-
- if p.returncode == 255 and in_data and checkrc:
- raise AnsibleConnectionFailure('SSH Error: data could not be sent to remote host "%s". Make sure this host can be reached over ssh' % self.host)
-
- return (p.returncode, b_stdout, b_stderr)
-
-
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- @_ssh_retry
- def _run(self, cmd, in_data, sudoable=True, checkrc=True):
- """Wrapper around _bare_run that retries the connection
- """
- return self._bare_run(cmd, in_data, sudoable, checkrc)
-
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- def _run(self, cmd, in_data, sudoable=True):
- '''
- Starts the command and communicates with it until it ends.
- '''
-
- display_cmd = map(to_unicode, map(pipes.quote, cmd))
- display.vvv(u'SSH: EXEC {0}'.format(u' '.join(display_cmd)), host=self.host)
-
- # Start the given command. If we don't need to pipeline data, we can try
- # to use a pseudo-tty (ssh will have been invoked with -tt). If we are
- # pipelining data, or can't create a pty, we fall back to using plain
- # old pipes.
-
- p = None
-
- if isinstance(cmd, (text_type, binary_type)):
- cmd = to_bytes(cmd)
- else:
- cmd = map(to_bytes, cmd)
-
- if not in_data:
- try:
- # Make sure stdin is a proper pty to avoid tcgetattr errors
- master, slave = pty.openpty()
- p = subprocess.Popen(cmd, stdin=slave, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- stdin = os.fdopen(master, 'w', 0)
- os.close(slave)
- except (OSError, IOError):
- p = None
-
- if not p:
- p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- stdin = p.stdin
-
- # If we are using SSH password authentication, write the password into
- # the pipe we opened in _build_command.
-
- if self._play_context.password:
- os.close(self.sshpass_pipe[0])
- os.write(self.sshpass_pipe[1], "{0}\n".format(to_bytes(self._play_context.password)))
- os.close(self.sshpass_pipe[1])
-
- ## SSH state machine
- #
- # Now we read and accumulate output from the running process until it
- # exits. Depending on the circumstances, we may also need to write an
- # escalation password and/or pipelined input to the process.
-
- states = [
- 'awaiting_prompt', 'awaiting_escalation', 'ready_to_send', 'awaiting_exit'
- ]
-
- # Are we requesting privilege escalation? Right now, we may be invoked
- # to execute sftp/scp with sudoable=True, but we can request escalation
- # only when using ssh. Otherwise we can send initial data straightaway.
-
- state = states.index('ready_to_send')
- if b'ssh' in cmd:
- if self._play_context.prompt:
- # We're requesting escalation with a password, so we have to
- # wait for a password prompt.
- state = states.index('awaiting_prompt')
- display.debug('Initial state: %s: %s' % (states[state], self._play_context.prompt))
- elif self._play_context.become and self._play_context.success_key:
- # We're requesting escalation without a password, so we have to
- # detect success/failure before sending any initial data.
- state = states.index('awaiting_escalation')
- display.debug('Initial state: %s: %s' % (states[state], self._play_context.success_key))
-
- # We store accumulated stdout and stderr output from the process here,
- # but strip any privilege escalation prompt/confirmation lines first.
- # Output is accumulated into tmp_*, complete lines are extracted into
- # an array, then checked and removed or copied to stdout or stderr. We
- # set any flags based on examining the output in self._flags.
-
- stdout = stderr = ''
- tmp_stdout = tmp_stderr = ''
-
- self._flags = dict(
- become_prompt=False, become_success=False,
- become_error=False, become_nopasswd_error=False
- )
-
- # select timeout should be longer than the connect timeout, otherwise
- # they will race each other when we can't connect, and the connect
- # timeout usually fails
- timeout = 2 + self._play_context.timeout
- rpipes = [p.stdout, p.stderr]
- for fd in rpipes:
- fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK)
-
- # If we can send initial data without waiting for anything, we do so
- # before we call select.
-
- if states[state] == 'ready_to_send' and in_data:
- self._send_initial_data(stdin, in_data)
- state += 1
-
- while True:
- rfd, wfd, efd = select.select(rpipes, [], [], timeout)
-
- # We pay attention to timeouts only while negotiating a prompt.
-
- if not rfd:
- if state <= states.index('awaiting_escalation'):
- # If the process has already exited, then it's not really a
- # timeout; we'll let the normal error handling deal with it.
- if p.poll() is not None:
- break
- self._terminate_process(p)
- raise AnsibleError('Timeout (%ds) waiting for privilege escalation prompt: %s' % (timeout, stdout))
-
- # Read whatever output is available on stdout and stderr, and stop
- # listening to the pipe if it's been closed.
-
- if p.stdout in rfd:
- chunk = p.stdout.read()
- if chunk == '':
- rpipes.remove(p.stdout)
- tmp_stdout += chunk
- display.debug("stdout chunk (state=%s):\n>>>%s<<<\n" % (state, chunk))
-
- if p.stderr in rfd:
- chunk = p.stderr.read()
- if chunk == '':
- rpipes.remove(p.stderr)
- tmp_stderr += chunk
- display.debug("stderr chunk (state=%s):\n>>>%s<<<\n" % (state, chunk))
-
- # We examine the output line-by-line until we have negotiated any
- # privilege escalation prompt and subsequent success/error message.
- # Afterwards, we can accumulate output without looking at it.
-
- if state < states.index('ready_to_send'):
- if tmp_stdout:
- output, unprocessed = self._examine_output('stdout', states[state], tmp_stdout, sudoable)
- stdout += output
- tmp_stdout = unprocessed
-
- if tmp_stderr:
- output, unprocessed = self._examine_output('stderr', states[state], tmp_stderr, sudoable)
- stderr += output
- tmp_stderr = unprocessed
- else:
- stdout += tmp_stdout
- stderr += tmp_stderr
- tmp_stdout = tmp_stderr = ''
-
- # If we see a privilege escalation prompt, we send the password.
- # (If we're expecting a prompt but the escalation succeeds, we
- # didn't need the password and can carry on regardless.)
-
- if states[state] == 'awaiting_prompt':
- if self._flags['become_prompt']:
- display.debug('Sending become_pass in response to prompt')
- stdin.write('{0}\n'.format(to_bytes(self._play_context.become_pass )))
- self._flags['become_prompt'] = False
- state += 1
- elif self._flags['become_success']:
- state += 1
-
- # We've requested escalation (with or without a password), now we
- # wait for an error message or a successful escalation.
-
- if states[state] == 'awaiting_escalation':
- if self._flags['become_success']:
- display.debug('Escalation succeeded')
- self._flags['become_success'] = False
- state += 1
- elif self._flags['become_error']:
- display.debug('Escalation failed')
- self._terminate_process(p)
- self._flags['become_error'] = False
- raise AnsibleError('Incorrect %s password' % self._play_context.become_method)
- elif self._flags['become_nopasswd_error']:
- display.debug('Escalation requires password')
- self._terminate_process(p)
- self._flags['become_nopasswd_error'] = False
- raise AnsibleError('Missing %s password' % self._play_context.become_method)
- elif self._flags['become_prompt']:
- # This shouldn't happen, because we should see the "Sorry,
- # try again" message first.
- display.debug('Escalation prompt repeated')
- self._terminate_process(p)
- self._flags['become_prompt'] = False
- raise AnsibleError('Incorrect %s password' % self._play_context.become_method)
-
- # Once we're sure that the privilege escalation prompt, if any, has
- # been dealt with, we can send any initial data and start waiting
- # for output.
-
- if states[state] == 'ready_to_send':
- if in_data:
- self._send_initial_data(stdin, in_data)
- state += 1
-
- # Now we're awaiting_exit: has the child process exited? If it has,
- # and we've read all available output from it, we're done.
-
- if p.poll() is not None:
- if not rpipes or not rfd:
- break
-
- # When ssh has ControlMaster (+ControlPath/Persist) enabled, the
- # first connection goes into the background and we never see EOF
- # on stderr. If we see EOF on stdout and the process has exited,
- # we're probably done. We call select again with a zero timeout,
- # just to make certain we don't miss anything that may have been
- # written to stderr between the time we called select() and when
- # we learned that the process had finished.
-
- if p.stdout not in rpipes:
- timeout = 0
- continue
-
- # If the process has not yet exited, but we've already read EOF from
- # its stdout and stderr (and thus removed both from rpipes), we can
- # just wait for it to exit.
-
- elif not rpipes:
- p.wait()
- break
-
- # Otherwise there may still be outstanding data to read.
-
- # close stdin after process is terminated and stdout/stderr are read
- # completely (see also issue #848)
- stdin.close()
-
- if C.HOST_KEY_CHECKING:
- if cmd[0] == b"sshpass" and p.returncode == 6:
- raise AnsibleError('Using a SSH password instead of a key is not possible because Host Key checking is enabled and sshpass does not support this. Please add this host\'s fingerprint to your known_hosts file to manage this host.')
-
- controlpersisterror = 'Bad configuration option: ControlPersist' in stderr or 'unknown configuration option: ControlPersist' in stderr
- if p.returncode != 0 and controlpersisterror:
- raise AnsibleError('using -c ssh on certain older ssh versions may not support ControlPersist, set ANSIBLE_SSH_ARGS="" (or ssh_args in [ssh_connection] section of the config file) before running again')
-
- if p.returncode == 255 and in_data:
- raise AnsibleConnectionFailure('SSH Error: data could not be sent to the remote host. Make sure this host can be reached over ssh')
-
- return (p.returncode, stdout, stderr)
-
-
- def _exec_command(self, cmd, in_data=None, sudoable=True):
- ''' run a command on the remote host '''
-
- super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
-
- display.vvv(u"ESTABLISH SSH CONNECTION FOR USER: {0}".format(self._play_context.remote_user), host=self._play_context.remote_addr)
-
- # we can only use tty when we are not pipelining the modules. piping
- # data into /usr/bin/python inside a tty automatically invokes the
- # python interactive-mode but the modules are not compatible with the
- # interactive-mode ("unexpected indent" mainly because of empty lines)
-
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- ssh_executable = self._play_context.ssh_executable
- if in_data:
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- cmd = self._build_command('ssh', self.host, cmd)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = self._build_command(ssh_executable, self.host, cmd)
- else:
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- cmd = self._build_command('ssh', '-tt', self.host, cmd)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = self._build_command(ssh_executable, '-tt', self.host, cmd)
-
- (returncode, stdout, stderr) = self._run(cmd, in_data, sudoable=sudoable)
-
- return (returncode, stdout, stderr)
-
-
- def dir_print(self,obj):
- for attr_name in dir(obj):
- try:
- attr_value = getattr(obj, attr_name)
- print(attr_name, attr_value, callable(attr_value))
- except:
- pass
-
-
- #
- # Main public methods
- #
- def exec_command(self, cmd, in_data=None, sudoable=False):
- ''' run a command on the chroot '''
- display.vvv('XXX exec_command: %s' % cmd)
- super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
-
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- ssh_executable = self._play_context.ssh_executable
- ##print dir(self)
- ##print dir(self._play_context)
- ##print self._play_context._attributes
- #self.dir_print(self._play_context)
- #vm = self._play_context.get_ds()
- #print( vm )
- #raise "blah"
- h = self.container_name
- if (self.lxc_version == 2):
- lxc_cmd = 'sudo -i lxc exec %s --mode=non-interactive -- /bin/sh -c %s' \
- % (pipes.quote(h),
- pipes.quote(cmd))
- elif (self.lxc_version == 1):
- lxc_cmd = 'sudo -i lxc-attach --name %s -- /bin/sh -c %s' \
- % (pipes.quote(h),
- pipes.quote(cmd))
- if in_data:
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- cmd = self._build_command('ssh', self.host, lxc_cmd)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = self._build_command(ssh_executable, self.host, lxc_cmd)
- else:
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- cmd = self._build_command('ssh', '-tt', self.host, lxc_cmd)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = self._build_command(ssh_executable, '-tt', self.host, lxc_cmd)
- #self.ssh.exec_command(lxc_cmd,in_data,sudoable)
- (returncode, stdout, stderr) = self._run(cmd, in_data, sudoable=sudoable)
- return (returncode, stdout, stderr)
-
-
- def put_file(self, in_path, out_path):
- ''' transfer a file from local to lxc '''
- super(Connection, self).put_file(in_path, out_path)
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- display.vvv('XXX put_file %s %s' % (in_path,out_path))
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- display.vvv(u"PUT {0} TO {1}".format(in_path, out_path), host=self.host)
- ssh_executable = self._play_context.ssh_executable
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- if not os.path.exists(in_path):
- raise errors.AnsibleFileNotFound("file or module does not exist: %s" % in_path)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- if not os.path.exists(to_bytes(in_path, errors='surrogate_or_strict')):
- raise AnsibleFileNotFound("file or module does not exist: {0}".format(to_native(in_path)))
-
- with open(in_path,'r') as in_f:
- in_data = in_f.read()
- cmd = ('cat > %s; echo -n done' % pipes.quote(out_path))
- h = self.container_name
- if (self.lxc_version == 2):
- lxc_cmd = 'sudo lxc exec %s --mode=non-interactive -- /bin/sh -c %s' \
- % (pipes.quote(h),
- pipes.quote(cmd))
- elif (self.lxc_version == 1):
- lxc_cmd = 'sudo lxc-attach --name %s -- /bin/sh -c %s' \
- % (pipes.quote(h),
- pipes.quote(cmd))
- if in_data:
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- cmd = self._build_command('ssh', self.host, lxc_cmd)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = self._build_command(ssh_executable, self.host, lxc_cmd)
- else:
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- cmd = self._build_command('ssh', '-tt', self.host, lxc_cmd)
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = self._build_command(ssh_executable, '-tt', self.host, lxc_cmd)
- #self.ssh.exec_command(lxc_cmd,in_data,sudoable)
- (returncode, stdout, stderr) = self._run(cmd, in_data, sudoable=False)
- return (returncode, stdout, stderr)
-
-
- def fetch_file(self, in_path, out_path):
- ''' fetch a file from lxc to local '''
- super(Connection, self).fetch_file(in_path, out_path)
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- display.vvv('XXX fetch_file %s %s' % (in_path,out_path))
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- display.vvv(u"FETCH {0} TO {1}".format(in_path, out_path), host=self.host)
- ssh_executable = self._play_context.ssh_executable
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- cmd = ('cat %s' % pipes.quote(in_path))
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = ('cat < %s' % pipes.quote(in_path))
- h = self.container_name
- if (self.lxc_version == 2):
- lxc_cmd = 'sudo lxc exec %s --mode=non-interactive -- /bin/sh -c %s' \
- % (pipes.quote(h),
- pipes.quote(cmd))
- elif (self.lxc_version == 1):
- lxc_cmd = 'sudo lxc-attach --name %s -- /bin/sh -c %s' \
- % (pipes.quote(h),
- pipes.quote(cmd))
-
- if LooseVersion(ansible_version) < LooseVersion('2.3.0.0'):
- in_data = None
- if in_data:
- cmd = self._build_command('ssh', self.host, lxc_cmd)
- else:
- cmd = self._build_command('ssh', '-tt', self.host, lxc_cmd)
- (returncode, stdout, stderr) = self._run(cmd, in_data, sudoable=False)
- if returncode != 0:
- raise AnsibleError("failed to transfer file from {0}:\n{1}\n{2}".format(in_path, stdout, stderr))
- with open(out_path,'w') as out_f:
- out_f.write(stdout)
-
- if LooseVersion(ansible_version) >= LooseVersion('2.3.0.0'):
- cmd = self._build_command(ssh_executable, self.host, lxc_cmd)
- (returncode, stdout, stderr) = self._run(cmd, None, sudoable=False)
-
- if returncode != 0:
- raise AnsibleError("failed to transfer file from {0}:\n{1}\n{2}".format(in_path, stdout, stderr))
- with open(out_path,'w') as out_f:
- out_f.write(stdout)
-
- return (returncode, stdout, stderr)
-
-
- # only used from Ansible version 2.3 on forward
- def reset(self):
- # If we have a persistent ssh connection (ControlPersist), we can ask it to stop listening.
- cmd = self._build_command(self._play_context.ssh_executable, '-O', 'stop', self.host)
- controlpersist, controlpath = self._persistence_controls(cmd)
- if controlpersist:
- display.vvv(u'sending stop: %s' % cmd)
- p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- stdout, stderr = p.communicate()
- status_code = p.wait()
- if status_code != 0:
- raise AnsibleError("Cannot reset connection:\n%s" % stderr)
- self.close()
-
-
- def close(self):
- ''' terminate the connection; nothing to do here '''
- display.vvv('XXX close')
- super(Connection, self).close()
- #self.ssh.close()
- self._connected = False
diff --git a/ansible/group_vars/all/bird.yml b/ansible/group_vars/all/bird.yml
new file mode 100644
index 0000000..dce5afa
--- /dev/null
+++ b/ansible/group_vars/all/bird.yml
@@ -0,0 +1,3 @@
+# which version of bird is used, 0-padded with 3 digits
+# 2.15 => 2015
+birdv: 0
diff --git a/ansible/group_vars/all/ipam.yml b/ansible/group_vars/all/ipam.yml
new file mode 100644
index 0000000..0430803
--- /dev/null
+++ b/ansible/group_vars/all/ipam.yml
@@ -0,0 +1,101 @@
+# Netmasks for prefixes:
+# 48: ffff:ffff:ffff:0000::
+# 52: ffff:ffff:ffff:f000::
+# 56: ffff:ffff:ffff:ff00::
+# 60: ffff:ffff:ffff:fff0::
+# 64: ffff:ffff:ffff:ffff::
+# 80: ffff:ffff:ffff:ffff:ffff:
+ipam6:
+ networks:
+ bitraf_dn42:
+ range: "fdb1:4242:3538::/48"
+ tnet_dn42:
+ range: "fdb1:4242:3538:2000::/52"
+ unused_2001:
+ range: "fdb1:4242:3538:2001::/64"
+ node1_dn42:
+ range: "fdb1:4242:3538:2002::/64"
+ hosts:
+ node1: "fdb1:4242:3538:2002::ffff"
+ node2_dn42:
+ range: "fdb1:4242:3538:2003::/64"
+ hosts:
+ node2: "fdb1:4242:3538:2003::ffff"
+ knot_dn42:
+ range: "fdb1:4242:3538:2004::/64"
+ hosts:
+ knot: "fdb1:4242:3538:2004::ffff"
+ coregonus_dn42:
+ range: "fdb1:4242:3538:2005::/64"
+ hosts:
+ coregonus: "fdb1:4242:3538:2005::ffff"
+ coregonus_docker:
+ range: "fdb1:4242:3538:2005:df01:676a:ec28:0a00/120"
+ kv24_dn42:
+ range: "fdb1:4242:3538:2006::/64"
+ hosts:
+ kv24ix: "fdb1:4242:3538:2006::ffff"
+ hash_dn42:
+ range: "fdb1:4242:3538:2007::/64"
+ hosts:
+ hash: "fdb1:4242:3538:2007::ffff"
+ hash_docker_dn42:
+ range: "fdb1:4242:3538:2007:1001::/112"
+ lhn2_dn42:
+ range: "fdb1:4242:3538:2008::/64"
+ hosts:
+ lhn2pi: "fdb1:4242:3538:2008::ffff"
+ conflatorio: "fdb1:4242:3538:2008:8042:32ff:fe0c:7161"
+ danneri: "fdb1:4242:3538:2008:9422:d355:95b7:f170"
+ unifi: "fdb1:4242:3538:2008:5054:ff:fe4d:96c"
+ danneri_cluster:
+ range: "fdb1:4242:3538:2009::/64"
+ danneri_service:
+ range: "fdb1:4242:3538:2010::/64"
+
+ k8s:
+ range: "fdb1:4242:3538:3000::/52"
+ danneri_cluster:
+ range: "fdb1:4242:3538:3009::/112"
+ danneri_service:
+ range: "fdb1:4242:3538:300a::/100"
+ danneri_service2:
+ range: "fdb1:4242:3538:300a::/112"
+
+ dn42:
+ range: "fd00::/8"
+
+routers:
+ knot:
+ as: 4242423538
+ peers:
+ hash:
+ routedbits_lon1:
+ as: 4242420207
+ hash:
+ as: 4242423538
+ peers:
+ knot:
+ lhn2:
+ as: 4242423538
+ peers:
+ knot:
+ node1:
+ as: 4242423538
+ peers:
+ knot:
+ hash:
+ node2:
+ as: 4242423538
+ peers:
+ knot:
+ hash:
+ kv24:
+ as: 4242423538
+ peers:
+ knot:
+ danneri:
+ as: 4242423538
+ peers:
+ knot:
+ hash:
diff --git a/ansible/host_vars/danneri/systemd-networkd.yml b/ansible/host_vars/danneri/systemd-networkd.yml
new file mode 100644
index 0000000..023e276
--- /dev/null
+++ b/ansible/host_vars/danneri/systemd-networkd.yml
@@ -0,0 +1,2 @@
+systemd_networkd__files:
+ - danneri/systemd-networkd/enp1s0.network
diff --git a/ansible/host_vars/hash/roa-server.vault.yml b/ansible/host_vars/hash/roa-server.vault.yml
new file mode 100644
index 0000000..a750fb2
--- /dev/null
+++ b/ansible/host_vars/hash/roa-server.vault.yml
@@ -0,0 +1,19 @@
+$ANSIBLE_VAULT;1.1;AES256
+38363463316565643131623966623232623833613832383566353166636462613237396635396239
+3832343533663432353731353231313732386662333035330a363464616131316264613331383333
+31353331336166313361623833343135653761653133623931396464383436633132393963303462
+3630653434643266610a613130653961636362313065353833613036623239333635643164333266
+64373064363563666435383062626139356630643163386134366133333933383939343265646365
+33323165353331656232303133613263346530376333336565393235393564373562613732323766
+32613534306565386135303263383561316230303434656664323635666463663062313661343338
+39313535393964383232643337666364343763623964303130343631393964633330303038666364
+64346362343066643566333030313232396334643139613066336332633466663466663530346339
+39613430303461326431663832386537643061313961663332356661663535306266323064313634
+62393663373364336239626233396336636232376532343732616432343031653361383734333235
+31343032396532313531396135376263373163396634626166363366663365653562613130313839
+65656136633965643035353234333037663363616366323830333265616236613761323836303461
+39656237343561646166616265383630366432333631303938393938346232613039373735356333
+36626537353564353662616566643635336464336432636464616663336661373965323035326232
+34373831613465313161343132383036666338303166626639646539303438376335323261356532
+34346535656462646562333332393561656262656631303465346330643934343039663762396563
+3437326539616661643163396461663930376232396136333634
diff --git a/ansible/host_vars/lhn2pi/all.yml b/ansible/host_vars/lhn2pi/all.yml
new file mode 100644
index 0000000..447906a
--- /dev/null
+++ b/ansible/host_vars/lhn2pi/all.yml
@@ -0,0 +1,2 @@
+systemd_networkd__files:
+ - lhn2pi/systemd/network/10-eth0.network
diff --git a/ansible/inventory b/ansible/inventory
index 4e2d0b2..cff290b 100644
--- a/ansible/inventory
+++ b/ansible/inventory
@@ -33,8 +33,8 @@ all:
ansible_host: 192.168.10.202
babypi:
ansible_host: 192.168.10.159
- astyanax:
- ansible_host: astyanax.vpn.trygvis.io
+ # astyanax:
+ # ansible_host: astyanax.vpn.trygvis.io
sweetzpot-mobile:
ansible_host: 192.168.10.123
sweetzpot-macos:
@@ -44,6 +44,12 @@ all:
ansible_host: lhn2pi.vpn.trygvis.io
lhn2ix:
kv24ix:
+ coregonus:
+ ansible_host: 192.168.10.190
+ danneri:
+ ansible_host: danneri.dn42.trygvis.io
+ unifi:
+ ansible_host: unifi.dn42.trygvis.io
node1:
ansible_host: 9859f51e-1e3e-4c05-a826-b7fbe18d91be.pub.instances.scw.cloud
@@ -148,10 +154,12 @@ all:
android-trygvis:
arius:
astyanax:
+ state: absent
babypi:
birgitte:
biwia:
conflatorio:
+ coregonus:
hash:
knot:
kv24ix:
@@ -173,6 +181,8 @@ all:
hosts:
akili:
astyanax:
+ conflatorio:
+ coregonus:
hash:
knot:
kv24ix:
@@ -185,6 +195,8 @@ all:
hosts:
akili:
astyanax:
+ conflatorio:
+ coregonus:
hash:
knot:
lhn2pi:
diff --git a/ansible/plays/danneri.yml b/ansible/plays/danneri.yml
new file mode 100644
index 0000000..88d6412
--- /dev/null
+++ b/ansible/plays/danneri.yml
@@ -0,0 +1,23 @@
+- hosts:
+ - danneri
+ tasks:
+ - import_role:
+ name: systemd-networkd
+
+ - meta: flush_handlers
+
+ - become: yes
+ apt:
+ name:
+ - etckeeper
+ - import_role:
+ name: timezone
+
+ - become: yes
+ copy:
+ dest: /etc/rancher/k3s/config.yaml
+ content: |
+ tls-san:
+ - "{{ ipam6.networks.lhn2_dn42.hosts.danneri }}"
+ - "2a06:2240:f00d:b500:9422:d355:95b7:f170"
+
diff --git a/ansible/plays/host-hash.yml b/ansible/plays/host-hash.yml
new file mode 100644
index 0000000..62b781f
--- /dev/null
+++ b/ansible/plays/host-hash.yml
@@ -0,0 +1,10 @@
+- hosts: hash
+ tasks:
+ - become: yes
+ copy:
+ dest: /etc/docker/daemon.json
+ content: |
+ {
+ "ipv6": true,
+ "fixed-cidr-v6": "{{ ipam6.networks.hash_docker_dn42.range }}"
+ }
diff --git a/ansible/plays/host-lhn2pi.yml b/ansible/plays/host-lhn2pi.yml
new file mode 100644
index 0000000..551c3dd
--- /dev/null
+++ b/ansible/plays/host-lhn2pi.yml
@@ -0,0 +1,6 @@
+- hosts:
+ - lhn2pi
+ roles:
+ - systemd-networkd
+ - prometheus-bird-exporter
+ - prometheus-node-exporter
diff --git a/ansible/plays/ipam-generate-dns.yml b/ansible/plays/ipam-generate-dns.yml
new file mode 100644
index 0000000..d29b3e8
--- /dev/null
+++ b/ansible/plays/ipam-generate-dns.yml
@@ -0,0 +1,32 @@
+- hosts: localhost
+ gather_facts: no
+ connection: local
+ tasks:
+ - set_fact:
+ content: |
+ {% set hosts = [] %}
+ {% for nw_name, network in ipam6.networks.items() %}
+ {% for host, address in (network.hosts|default({})).items() %}
+ {{- hosts.append({'name': host, 'address': address}) -}}
+ {% endfor %}
+ {% endfor %}
+ # Generated from ansible data
+ {% for h in hosts|sort(attribute='name') %}
+
+ resource "linode_domain_record" "dn42-{{ h.name }}" {
+ domain_id = linode_domain.root.id
+ name = "{{ h.name }}.dn42"
+ record_type = "AAAA"
+ target = "{{ h.address|ansible.utils.ipv6('address') }}"
+ }
+ {% endfor %}
+ - debug:
+ msg: "{{ content }}"
+ when: false
+ - name: Generating ../../terraform/dns/dn42.tf
+ register: tf
+ copy:
+ dest: ../../terraform/dns/dn42.tf
+ content: "{{ content }}"
+ - shell: terraform fmt ../../terraform/ipam6/ipam6.tf
+ when: "tf.changed"
diff --git a/ansible/plays/ipam-generate-tf.yml b/ansible/plays/ipam-generate-tf.yml
new file mode 100644
index 0000000..209b8ab
--- /dev/null
+++ b/ansible/plays/ipam-generate-tf.yml
@@ -0,0 +1,53 @@
+- hosts: localhost
+ gather_facts: no
+ connection: local
+ collections:
+ - ansible.utils
+ tasks:
+ - name: Generate terraform/ipam6/ipam6.tf
+ register: tf
+ copy:
+ dest: ../../terraform/ipam6/ipam6.tf
+ content: |
+ output "networks" {
+ value = {
+ {% for name, network in ipam6.networks.items() %}
+ {% if not (network.range | ansible.utils.ipv6) %}
+ Invalid network: {{ network.range }}
+ {% endif %}
+ {{ name }} = {
+ {% if network.description|default("") %}
+ description = "{{ network.description }}"
+ {% endif %}
+ range = "{{ network.range }}"
+ address = "{{ network.range|ansible.utils.ipaddr("network") }}"
+ prefix = "{{ network.range|ansible.utils.ipaddr("prefix") }}"
+ {% set hosts = network.hosts|default({}) %}
+ hosts = {
+ {% for name, addr in hosts.items() %}
+ {{ name }} = {
+ address: "{{ addr|ansible.utils.ipaddr("address") }}"
+ prefix: "{{ addr|ansible.utils.ipaddr("prefix") }}"
+ }
+ {% endfor %}
+ }
+ }
+ {% endfor %}
+ }
+ }
+
+ output "hosts" {
+ value = {
+ {% for name, network in ipam6.networks.items() %}
+ {% set hosts = network.hosts|default({}) %}
+ {% for name, addr in hosts.items() %}
+ {{ name }} = {
+ address: "{{ addr|ansible.utils.ipaddr("address") }}"
+ prefix: "{{ addr|ansible.utils.ipaddr("prefix") }}"
+ }
+ {% endfor %}
+ {% endfor %}
+ }
+ }
+ - shell: terraform fmt ../../terraform/ipam6/ipam6.tf
+ when: "tf.changed"
diff --git a/ansible/plays/roa-server.yml b/ansible/plays/roa-server.yml
new file mode 100644
index 0000000..c662640
--- /dev/null
+++ b/ansible/plays/roa-server.yml
@@ -0,0 +1,25 @@
+- hosts:
+ - hash
+ tasks:
+ - name: mkdir /etc/docker-service/roa-server
+ become: true
+ file:
+ path: /etc/docker-service/roa-server
+ state: directory
+ mode: 0700
+ - name: Install /etc/docker-service/roa-server/private.pem
+ become: true
+ copy:
+ dest: /etc/docker-service/roa-server/private.pem
+ content: "{{ roa_server.private }}"
+ owner: root
+ group: root
+ mode: 0444
+
+ - import_role:
+ name: docker-service
+ vars:
+ service: roa-server
+ template: templates/roa-server/docker-compose.yml
+# systemd_enabled: no
+# systemd_state: stopped
diff --git a/ansible/plays/templates/danneri/systemd-networkd/enp1s0.network b/ansible/plays/templates/danneri/systemd-networkd/enp1s0.network
new file mode 100644
index 0000000..b38116c
--- /dev/null
+++ b/ansible/plays/templates/danneri/systemd-networkd/enp1s0.network
@@ -0,0 +1,8 @@
+[Match]
+Name=enp1s0
+
+[Network]
+DHCP=ipv4
+
+[IPv6AcceptRA]
+Token=static:{{ ipam6.networks.lhn2_dn42.hosts.danneri }}
diff --git a/ansible/plays/templates/lhn2pi/systemd/network/10-eth0.network b/ansible/plays/templates/lhn2pi/systemd/network/10-eth0.network
new file mode 100644
index 0000000..853556d
--- /dev/null
+++ b/ansible/plays/templates/lhn2pi/systemd/network/10-eth0.network
@@ -0,0 +1,11 @@
+[Match]
+Name=eth0
+
+[Network]
+DHCP=ipv4
+Address={{ ipam6.networks.lhn2_dn42.hosts.lhn2pi }}
+# IPv6Forwarding=yes # needs newer systemd
+
+# Disables the automatic activation of DHCPv6 from RA packets
+[IPv6AcceptRA]
+DHCPv6Client=no
diff --git a/ansible/plays/templates/roa-server/docker-compose.yml b/ansible/plays/templates/roa-server/docker-compose.yml
new file mode 100644
index 0000000..c11933c
--- /dev/null
+++ b/ansible/plays/templates/roa-server/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3"
+services:
+ stayrtr:
+ image: rpki/stayrtr:latest # no tagged images are available :(
+ volumes:
+ - /etc/docker-service/roa-server/id_ecdsa:/id_ecdsa:ro
+ ports:
+ - 8022:8022
+ command:
+ - -bind=
+ - -ssh.bind=:8022
+ - -ssh.key=/id_ecdsa
+ - -checktime=false
+ - -cache=https://dn42.burble.com/roa/dn42_roa_46.json
diff --git a/ansible/prometheus/deploy-config.yml b/ansible/prometheus/deploy-config.yml
new file mode 100644
index 0000000..472d05c
--- /dev/null
+++ b/ansible/prometheus/deploy-config.yml
@@ -0,0 +1,19 @@
+- hosts:
+ - conflatorio
+ tasks:
+ - become: yes
+ file:
+ path: /etc/docker-service/prometheus
+ state: directory
+ owner: root
+ group: root
+
+ - become: yes
+ notify: reload prometheus
+ copy:
+ dest: /etc/docker-service/prometheus/prometheus.yml
+ src: "{{ inventory_hostname }}/prometheus.yml"
+
+ handlers:
+ - name: reload prometheus
+ shell: docker kill --signal HUP prometheus
diff --git a/ansible/prometheus/files/conflatorio/prometheus.yml b/ansible/prometheus/files/conflatorio/prometheus.yml
new file mode 100644
index 0000000..9fc1316
--- /dev/null
+++ b/ansible/prometheus/files/conflatorio/prometheus.yml
@@ -0,0 +1,25 @@
+global:
+ scrape_interval: 15s
+ evaluation_interval: 15s
+
+rule_files:
+ # - "first.rules"
+ # - "second.rules"
+
+scrape_configs:
+ - job_name: prometheus
+ static_configs:
+ - targets: ['localhost:9090']
+
+ - job_name: node
+ static_configs:
+ - targets:
+ - "knot.vpn.trygvis.io:9100"
+ - "hash.vpn.trygvis.io:9323"
+ - "conflatorio.vpn.trygvis.io:9100"
+
+ - job_name: bird
+ static_configs:
+ - targets:
+ - "knot.vpn.trygvis.io:9324"
+ - "conflatorio.vpn.trygvis.io:9324"
diff --git a/ansible/roles/prometheus-bird-exporter/handlers/main.yml b/ansible/roles/prometheus-bird-exporter/handlers/main.yml
new file mode 100644
index 0000000..f4f9381
--- /dev/null
+++ b/ansible/roles/prometheus-bird-exporter/handlers/main.yml
@@ -0,0 +1,5 @@
+- name: restart
+ become: yes
+ systemd:
+ name: prometheus-bird-exporter
+ state: restarted
diff --git a/ansible/roles/prometheus-bird-exporter/tasks/main.yml b/ansible/roles/prometheus-bird-exporter/tasks/main.yml
new file mode 100644
index 0000000..6d8b999
--- /dev/null
+++ b/ansible/roles/prometheus-bird-exporter/tasks/main.yml
@@ -0,0 +1,18 @@
+- become: yes
+ package:
+ name: "{{ items }}"
+ state: present
+ vars:
+ items:
+ - prometheus-bird-exporter
+- name: /etc/default/prometheus-bird-exporter
+ become: yes
+ copy:
+ dest: /etc/default/prometheus-bird-exporter
+ content: |
+ # Set the command-line arguments to pass to the server.
+ # Due to shell escaping, to pass backslashes for regexes, you need to double
+ # them (\\d for \d). If running under systemd, you need to double them again
+ # (\\\\d to mean \d), and escape newlines too.
+ ARGS="-bird.v2 -format.new"
+ notify: restart
diff --git a/ansible/roles/prometheus-node-exporter/handlers/main.yml b/ansible/roles/prometheus-node-exporter/handlers/main.yml
new file mode 100644
index 0000000..f4f9381
--- /dev/null
+++ b/ansible/roles/prometheus-node-exporter/handlers/main.yml
@@ -0,0 +1,5 @@
+- name: restart
+ become: yes
+ systemd:
+ name: prometheus-bird-exporter
+ state: restarted
diff --git a/ansible/roles/prometheus-node-exporter/tasks/main.yml b/ansible/roles/prometheus-node-exporter/tasks/main.yml
new file mode 100644
index 0000000..e7c6d18
--- /dev/null
+++ b/ansible/roles/prometheus-node-exporter/tasks/main.yml
@@ -0,0 +1,18 @@
+- become: yes
+ package:
+ name: "{{ items }}"
+ state: present
+ vars:
+ items:
+ - prometheus-node-exporter
+- name: /etc/default/prometheus-node-exporter
+ become: yes
+ copy:
+ dest: /etc/default/prometheus-node-exporter
+ content: |
+ # Set the command-line arguments to pass to the server.
+ # Due to shell escaping, to pass backslashes for regexes, you need to double
+ # them (\\d for \d). If running under systemd, you need to double them again
+ # (\\\\d to mean \d), and escape newlines too.
+ ARGS=""
+ notify: restart
diff --git a/ansible/roles/systemd-networkd/handlers/main.yml b/ansible/roles/systemd-networkd/handlers/main.yml
index 9656da4..c9b2603 100644
--- a/ansible/roles/systemd-networkd/handlers/main.yml
+++ b/ansible/roles/systemd-networkd/handlers/main.yml
@@ -1,4 +1,5 @@
-- name: restart
+- name: reload
+ become: yes
systemd:
name: systemd-networkd
- state: restarted
+ state: reloaded
diff --git a/ansible/roles/systemd-networkd/tasks/main.yml b/ansible/roles/systemd-networkd/tasks/main.yml
index 13c167b..aed4168 100644
--- a/ansible/roles/systemd-networkd/tasks/main.yml
+++ b/ansible/roles/systemd-networkd/tasks/main.yml
@@ -1,9 +1,18 @@
-- systemd:
+- become: yes
+ systemd:
name: systemd-networkd
state: started
enabled: yes
-- loop: "{{ systemd_networkd__files | default([]) }}"
- copy:
+- name: mkdir /etc/systemd/network
+ become: yes
+ file:
+ path: "/etc/systemd/network"
+ state: directory
+ owner: systemd-network
+ group: systemd-network
+- become: yes
+ loop: "{{ systemd_networkd__files | default([]) }}"
+ template:
src: "{{ item }}"
dest: "/etc/systemd/network/{{ item | basename }}"
- notify: restart
+ notify: reload
diff --git a/ansible/wg0/files/coregonus/etc/wireguard/public-wg0.key b/ansible/wg0/files/coregonus/etc/wireguard/public-wg0.key
new file mode 100644
index 0000000..16f44f9
--- /dev/null
+++ b/ansible/wg0/files/coregonus/etc/wireguard/public-wg0.key
@@ -0,0 +1 @@
+M1qJnHL6GD19On7y11uVF9m5J2noqspbfgZRmmEnwkc=
diff --git a/ansible/wg0/group_vars/all/wireguard_wg0.yml b/ansible/wg0/group_vars/all/wireguard_wg0.yml
index 3a8099c..109de3d 100644
--- a/ansible/wg0/group_vars/all/wireguard_wg0.yml
+++ b/ansible/wg0/group_vars/all/wireguard_wg0.yml
@@ -16,7 +16,7 @@ wireguard_wg0:
ipv4: 192.168.60.2
ipv6: fdf3:aad9:a885:0b3a::2
conflatorio:
- state: absent
+ state: present
ipv6: fdf3:aad9:a885:0b3a::3
arius:
state: present
@@ -33,7 +33,7 @@ wireguard_wg0:
state: present
ipv6: fdf3:aad9:a885:0b3a::9
astyanax:
- state: present
+ state: absent
ipv6: fdf3:aad9:a885:0b3a::10
allowed_ips:
- fdf3:aad9:a885:ba65::/64
@@ -66,3 +66,6 @@ wireguard_wg0:
biwia:
state: present
ipv6: fdf3:aad9:a885:0b3a::17
+ coregonus:
+ state: present
+ ipv6: fdf3:aad9:a885:0b3a::18
diff --git a/ansible/wg0/wireguard-wg0-terraform.yml b/ansible/wg0/wireguard-wg0-terraform.yml
index 33b4b47..c4c809c 100644
--- a/ansible/wg0/wireguard-wg0-terraform.yml
+++ b/ansible/wg0/wireguard-wg0-terraform.yml
@@ -7,11 +7,12 @@
content: |
# Generated from ansible data
{% for host, data in wireguard_wg0.hosts.items() %}
+ {% if data.state | default("present") == "present" %}
resource "linode_domain_record" "vpn-{{ host }}" {
domain_id = linode_domain.root.id
name = "{{ host }}.vpn"
record_type = "AAAA"
target = "{{ data.ipv6 }}"
}
+ {% endif %}
{% endfor %}
-