Hello community, here is the log from the commit of package yomi-formula for openSUSE:Factory checked in at 2020-10-15 13:48:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yomi-formula (Old) and /work/SRC/openSUSE:Factory/.yomi-formula.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yomi-formula" Thu Oct 15 13:48:17 2020 rev:18 rq:841593 version:0.0.1+git.1601999695.6141130 Changes: -------- --- /work/SRC/openSUSE:Factory/yomi-formula/yomi-formula.changes 2020-09-10 22:47:29.827793511 +0200 +++ /work/SRC/openSUSE:Factory/.yomi-formula.new.3486/yomi-formula.changes 2020-10-15 13:48:39.201255525 +0200 @@ -1,0 +2,6 @@ +Tue Oct 06 15:55:24 UTC 2020 - Alberto Planas Dominguez <apla...@suse.com> + +- Update to version 0.0.1+git.1601999695.6141130: + * README: add user provided config + +------------------------------------------------------------------- Old: ---- yomi-0.0.1+git.1598948600.9a9eab0.obscpio New: ---- yomi-0.0.1+git.1601999695.6141130.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yomi-formula.spec ++++++ --- /var/tmp/diff_new_pack.Wys6YR/_old 2020-10-15 13:48:42.521256914 +0200 +++ /var/tmp/diff_new_pack.Wys6YR/_new 2020-10-15 13:48:42.525256916 +0200 @@ -20,7 +20,7 @@ %define fdir %{_datadir}/salt-formulas Name: yomi-formula -Version: 0.0.1+git.1598948600.9a9eab0 +Version: 0.0.1+git.1601999695.6141130 Release: 0 Summary: Yomi - Yet one more installer License: Apache-2.0 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Wys6YR/_old 2020-10-15 13:48:42.569256934 +0200 +++ /var/tmp/diff_new_pack.Wys6YR/_new 2020-10-15 13:48:42.573256936 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/yomi.git</param> - <param name="changesrevision">9a9eab076dfb718dc280198c2a4901fbe4b29b17</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">614113073239d0419c219c49eaf8754da300eec8</param></service></servicedata> \ No newline at end of file ++++++ yomi-0.0.1+git.1598948600.9a9eab0.obscpio -> yomi-0.0.1+git.1601999695.6141130.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yomi-0.0.1+git.1598948600.9a9eab0/README.md new/yomi-0.0.1+git.1601999695.6141130/README.md --- old/yomi-0.0.1+git.1598948600.9a9eab0/README.md 2020-09-01 10:23:20.000000000 +0200 +++ new/yomi-0.0.1+git.1601999695.6141130/README.md 2020-10-06 17:54:55.000000000 +0200 @@ -381,8 +381,8 @@ During boot time of the Yomi image we can change the address where is expected to find the master node. To do that we can enter under the -GRUB menu the entry `master=my_master_address`. For example -`master=10.0.2.2` will make the minion to search the master in the +GRUB menu the entry `ym.master=my_master_address`. For example +`ym.master=10.0.2.2` will make the minion to search the master in the address `10.0.2.2`. An internal systemd service in the image will detect this address and @@ -398,18 +398,41 @@ In a similar way, during the boot process we can set the minion ID that will be assigned to the `salt-minion`. Using the parameter -`minion_id`. For example, `minion_id=worker01` will set the minion ID -for this system as `worker01`. +`ym.minion_id`. For example, `ym.minion_id=worker01` will set the +minion ID for this system as `worker01`. The rules for the minion ID are a bit more complicated. Salt, by default, set the minion ID equal to the FQDN or the IP of the node if no ID is specified. This cannot be a good idea if the IP changes, so the current rules are: -* The value from `minion_id` boot parameter. +* The value from `ym.minion_id` boot parameter. * The FQDN hostname of the system, if is different from localhost. * The MAC address of the first interface of the system. +## Adding user provided configuration + +Sometimes we need to inject in the `salt-minion` some extra +configuration, before the service runs. For example, we might need to +add some grains, or enable some feature in the `salt-minion` service +running inside the image. + +To do that we have to options: we can pass an URL with the content, or +we can add the full content as a parameter during the boot process. + +To pass an URL we should use `ym.config_url` parameter. For example, +`ym.config_url=http://server.com/pub/myconfig.cfg` will download the +configuration file, and will store it under the default name +`config_url.cfg` in `/etc/salt/minion.d`. We can set a different name +from the default via the parameter `ym.config_url_name`. + +In a similar way we can use the parameter `ym.config` to declare the +full content of the user provided configuration file. You need to use +quotes to mark the string and escaped control codes to indicate new +lines or tabs, like `ym.config="grains:\n my_grain: my_value"`. This +will create a file named `config.cfg`, and the name can be overwritten +with the parameter `ym.config_name`. + ## Container Because the versatility of Salt, is possible to execute the modules ++++++ yomi.obsinfo ++++++ --- /var/tmp/diff_new_pack.Wys6YR/_old 2020-10-15 13:48:42.789257027 +0200 +++ /var/tmp/diff_new_pack.Wys6YR/_new 2020-10-15 13:48:42.789257027 +0200 @@ -1,5 +1,5 @@ name: yomi -version: 0.0.1+git.1598948600.9a9eab0 -mtime: 1598948600 -commit: 9a9eab076dfb718dc280198c2a4901fbe4b29b17 +version: 0.0.1+git.1601999695.6141130 +mtime: 1601999695 +commit: 614113073239d0419c219c49eaf8754da300eec8