Commit graph

169 commits

Author SHA1 Message Date
Fredrik Thulin 496b9f4b31
shellcheck fixes 2023-02-07 16:09:37 +01:00
Fredrik Thulin 252d478e2d
cosmos-db.yaml is no more 2023-02-07 16:09:25 +01:00
Fredrik Thulin 1bddf21049
remove 'make db' target as well 2023-02-07 15:04:01 +01:00
Fredrik Thulin c400bba97d
remove 'make db'
The db-file, essentially providing reverse lookup of classes to host
names, is only used by some Nagios configuration instances and causes
continuing operational headaches in those ops-repos.

It should be kept/refactored to only apply to the monitoring hosts in
the cases where it is used, but we don't want any new ops-repos to use
it hence it should be removed from upstream multiverse.
2023-02-07 14:21:29 +01:00
Micke Nordin 46f4fc6d33
Merge pull request #35 from SUNET/jocar-fix-eyaml
Make sure of separator
2023-02-07 08:57:49 +01:00
Johan Wassberg cae694d1ce
Make sure of separator
We use the separator later on to determine where the yaml document starts.
`eyaml edit` adds the separator to new (non-existing) files by itself but
since we want to create the file before in order to diff later the separator
needs to be added in order to get a valid document.
2023-02-07 08:49:31 +01:00
Patrik Lundin 0db8d1fd9a
Merge pull request #34 from SUNET/feature-ft-cron_wrapper_improvements
cron wrapper improvements
2023-02-07 07:33:24 +01:00
Fredrik Thulin 12b2412ea7
run cron at boot too, to e.g. get new firewall rules installed 2023-02-06 17:12:01 +01:00
Fredrik Thulin 79606f2a6d
check for /etc/no-automatic-cosmos in the wrapper, and allow arguments to be passed 2023-02-06 16:47:41 +01:00
Fredrik Thulin 3988f5beb0
shellcheck fixes 2023-02-06 16:47:30 +01:00
Patrik Lundin 906edf3caf
Merge pull request #32 from SUNET/feature-ft-install_eyaml
Install eyaml on newer hosts
2023-02-06 12:31:31 +01:00
Johan Wassberg 8599d395c2
Merge pull request #33 from SUNET/feature-ft-tinkering
tinkering
2023-02-03 16:10:54 +01:00
Fredrik Thulin 708c6c1b64
add set -e, and do some shellcheck cleanup 2023-02-03 16:05:09 +01:00
Fredrik Thulin 25463e6013
respect COSMOS_VERBOSE 2023-02-03 16:04:51 +01:00
Fredrik Thulin f9a286fc05
install eyaml on Ubuntu from 18.04 and Debian from version 10 2023-02-03 15:40:15 +01:00
Fredrik Thulin e08346aa30
cleanup, use stamp-file, only run on old OS versions 2023-02-03 15:39:49 +01:00
Johan Wassberg 948cc80389
Update cosmos-puppet-ops.mkd 2023-02-03 11:24:55 +01:00
Johan Wassberg 4c877bc6ea
Syntax error 2023-02-03 10:58:25 +01:00
Fredrik Thulin 17288b9d0b
init 2023-02-02 18:32:18 +01:00
Micke Nordin ba1e40ffd3
Merge pull request #31 from theseal/wrap-cosmos
Wrap cosmos
2023-02-02 13:01:02 +01:00
Johan Wassberg 84b29e4eaa
Executable 2023-02-02 11:49:10 +01:00
Johan Wassberg 49ba964897
Wrap cosmos in scriptherder if available
nunoc-ops and others has been doing this for ages by just modifing the cron
file.
2023-02-02 11:45:54 +01:00
Micke Nordin 10430a91a9
Merge pull request #30 from eest/patlu-update-cosmos-modules-example
Update setup_cosmos_modules.example
2023-02-01 12:55:04 +01:00
Patrik Lundin 281f818062
Update setup_cosmos_modules.example
* Only update cosmos-modules.conf if a change is needed
* Do an atomic replace of the file if updating it
* Add a note at the top mentioning that it is tool-generated
* Make pylint and black happy

Tested in ubuntu 18.04.
2023-02-01 11:33:54 +01:00
Patrik Lundin e212b6f56f
Support master branch being renamed to main
Fixes:
```
70run-post-tasks: invoking /var/cache/cosmos/model/post-tasks.d/018packages
Your configuration specifies to merge with the ref 'refs/heads/master'
from the remote, but no such ref was fetched.
```
2023-01-31 08:52:28 +01:00
Fredrik Thulin 4601e0bf08
make sure we get clean checkouts 2023-01-30 14:56:15 +01:00
Patrik Lundin 582cb8a691
Merge pull request #29 from theseal/jocar-backport-no-protection
set no-protection on the private key
2023-01-30 12:12:19 +01:00
Leif Johansson d604d2fab5
set no-protection on the private key 2023-01-30 12:07:33 +01:00
Micke Nordin 3234cc59e3
Merge pull request #25 from theseal/fix-etc-hosts
Don't confuse containers to connect to them self
2023-01-30 11:31:00 +01:00
Micke Nordin 64c12216bd
Merge pull request #28 from theseal/only-update-db-when-needed
Only update the database when needed
2023-01-30 11:30:21 +01:00
Johan Wassberg 57b302a299
Only update the database when needed
Without this fix:
```
➜  nunoc-ops git:(master) make db
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean
make: *** [db] Error 1
```

With this fix:
```
➜  swamid-ops git:(master) ✗ make db
make: Nothing to be done for `db'.
```

Will make it easier to only use `make tag` when to sign changes.
2023-01-30 11:21:01 +01:00
Fredrik Thulin 92c76f4f3f
Merge pull request #27 from SUNET/kano-setup-cosmos-modules-example
Add example setup_cosmos_modules script
2023-01-27 10:36:37 +01:00
Micke Nordin bb62889454
Move example script to docs 2023-01-27 10:34:59 +01:00
Micke Nordin 2e0ccdd92d
Add example setup_cosmos_modules script
This patch adds an example script written in python to help people get
started with writing their own implementation. The docs are also
updated.
2023-01-26 09:53:36 +01:00
Fredrik Thulin 73f3626176
Merge pull request #26 from eest/patlu-iaas-missing-default-user 2023-01-26 09:06:39 +01:00
Patrik Lundin f1ab4506f1
iaas-setup.sh: support default user not existing
For CNaaS machines we supply cloud-init user-data that does not create a
default user, in this case the script would exit half-way through. Now
it only tries to remove a user if it exists in the first place.
2023-01-26 08:45:04 +01:00
Johan Wassberg bc17ee1354
Don't confuse containers to connect to them self
When the hostname pointed to loopback the containers tried to connect to them
self instead of the host.
2023-01-24 10:01:59 +01:00
Micke Nordin 714506da1e
Merge pull request #24 from SUNET/ft-dynamic_cosmos_modules
Allow dynamically generated /etc/puppet/cosmos-modules.conf.
2023-01-19 18:32:21 +01:00
Micke Nordin 192e7b77b5
Merge pull request #23 from SUNET/ft-test_in_docker
add script and Makefile target to test multiverse in a docker container
2023-01-19 18:26:53 +01:00
Fredrik Thulin 715105aadb
add documentation for dynamically generated cosmos-modules.conf 2023-01-19 17:56:51 +01:00
Fredrik Thulin 906e483c53
speling 2023-01-19 17:46:23 +01:00
Fredrik Thulin c3c6171f96
modules, not models 2023-01-19 17:30:18 +01:00
Fredrik Thulin e2e394a9af
generate /etc/puppet/cosmos-modules.conf dynamically 2023-01-19 17:19:42 +01:00
Fredrik Thulin 187e3bc9be
add script and Makefile target to test multiverse in a docker container 2023-01-19 17:18:04 +01:00
Fredrik Thulin 44f4fb6620
Merge pull request #22 from eest/backport-edit-secrets-from-cnaas-ops
Backport edit secrets from cnaas ops
2023-01-18 14:32:30 +01:00
Patrik Lundin a7d0a189da
Work around broken hiera-eyaml on 22.04
This can be removed once the linked bug report is solved.

Idea from, and implementation reviewed by, @fredrikt
2023-01-18 14:27:25 +01:00
Kristofer Hallin d12f6297ed
Support Ubuntu 20 as well for edit-secrets. 2023-01-18 14:27:06 +01:00
Fredrik Thulin c8451c2122
copy edit-secrets from eduid-ops 2023-01-18 14:26:40 +01:00
Gijutsu aa115ce052
Merge pull request #19 from theseal/master
Use puppet that comes with OS
2023-01-17 14:09:21 +01:00
Johan Wassberg fb4849a0df
Use puppet that comes with OS
nunoc-ops does like this since 2018 so I think it will fly.

Also the package `puppet` seems to been around since at-least Ubuntu 14.04.
2023-01-17 13:53:13 +01:00