fix: sort extra options in configuration

## [1.9.8](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.7...v1.9.8) (2021-11-30)

### Bug Fixes

* **master:** master.d template to support saltclass ext_pillar ([5b7d7ea](5b7d7ea70e))

### Continuous Integration

* **kitchen+ci:** update with `3004` pre-salted images/boxes [skip ci] ([47d6c23](47d6c23df3))

### Tests

* **_mapdata:** add verification file for OpenBSD 7.0 [skip ci] ([f1ead04](f1ead04517))
* **_mapdata:** update verification files for FreeBSD [skip ci] ([4b356b1](4b356b1213))

Fix: master.d template to support saltclass ext_pillar config

* Automated using https://github.com/myii/ssf-formula/pull/386

* Automated using https://github.com/myii/ssf-formula/pull/385

## [1.9.7](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.6...v1.9.7) (2021-11-22)

### Continuous Integration

* **kitchen+gitlab:** adjust matrix to add `3004` ([93289f6](93289f6df1))

### Tests

* **silicon:** add pillar and verification files for `3004` ([f9ff8ea](f9ff8eab10))

ci(kitchen+gitlab): adjust matrix to add `3004`

* Semi-automated using https://github.com/myii/ssf-formula/pull/385

## [1.9.6](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.5...v1.9.6) (2021-11-17)

### Continuous Integration

* use `pillars_from_directories` & `test/salt/pillar/top.sls` ([98c9dbf](98c9dbfcfb))

### Tests

* **pillar:** centralise and clean-up entries ([db5b69c](db5b69c9cd))
* centralise all suites into `default` suite ([b475e24](b475e24638))

test: merge all test suites into a single (`default`) suite

Modify the `default` suite to use the `saltmajorversion` InSpec input
rather than the `version` variable in `pkgs_spec.rb`.

* Automated using https://github.com/myii/ssf-formula/pull/384

## [1.9.5](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.4...v1.9.5) (2021-11-05)

### Bug Fixes

* make it possible to not have key_url set ([97e1d1f](97e1d1f07a)), closes [#520](https://github.com/saltstack-formulas/salt-formula/issues/520)
* update to modern defaults for Debian family ([a932a8c](a932a8cc84))

Fix repo management on Debian Bullseye and newer.

Don't add key_url as it is deprecated and not needed when
pkgrepo_keyring is set. This has been supported since stretch so make it
the default. Also use py3 repo by default for Debian family as it is now
the only option.

Additionally, Raspbian has been updated to use signed-by by default.

Fixes #520

Ensure extra options in generated configuration is sorted, to ensure stable
configuration.

## [1.9.4](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.3...v1.9.4) (2021-10-27)

### Bug Fixes

* **master:** don't manage config for saltstack enterprise master plugin ([184f338](184f338741))

Don't try to manage config for saltstack enterprise master plugin

* Automated using https://github.com/myii/ssf-formula/pull/381

* Automated using https://github.com/myii/ssf-formula/pull/380

* Automated using https://github.com/myii/ssf-formula/pull/378

* Automated using https://github.com/myii/ssf-formula/pull/375

## [1.9.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.2...v1.9.3) (2021-10-05)

### Continuous Integration

* **kitchen+ci:** update with latest CVE pre-salted images ([1a8512d](1a8512d77f))

### Tests

* **_mapdata:** reset indentation [skip ci] ([678548f](678548fc8b))
* **_mapdata:** use `15.3` for `opensuse-15.yaml` ([f4a91c4](f4a91c458c))
* **neon:** remove pillar and tests for `v3000` ([d00b04a](d00b04a5df))

ci(kitchen+gitlab): adjust matrix to use 3003.3, 3002.7 & 3001.8

* Semi-automated using https://github.com/myii/ssf-formula/pull/374

* Automated using https://github.com/myii/ssf-formula/pull/370

* Automated using https://github.com/myii/ssf-formula/pull/369

## [1.9.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.1...v1.9.2) (2021-09-17)

### Bug Fixes

* **debian,ubuntu:** rename repo file to match documentation ([47ab261](47ab261b39))

### Continuous Integration

* **mapdata:** remove Ubuntu 16.04 [skip ci] ([cd2a0bf](cd2a0bfdf0))

Fix Debian's family repository filename

Also:

* add keyring file for the salt repo, due to `apt-key` deprecation
* remove old repository file

* Automated using https://github.com/myii/ssf-formula/pull/368

* Automated using https://github.com/myii/ssf-formula/pull/367

## [1.9.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.0...v1.9.1) (2021-09-04)

### Bug Fixes

* **default:** set salt:minion:master_type to str ([ca1df1b](ca1df1b69e))

### Continuous Integration

* **freebsd:** update with latest pre-salted Vagrant boxes [skip ci] ([0231e63](0231e6368e))
* **gemfile+lock:** use `ssf` customised `inspec` repo [skip ci] ([a86e19e](a86e19e794))
* **kitchen:** move `provisioner` block & update `run_command` [skip ci] ([5cc8759](5cc8759efd))
* **kitchen+ci:** update with latest `3003.2` pre-salted images [skip ci] ([86b0fa1](86b0fa1d40))
* **pillar:** update master_type in pillar.example ([8fa064b](8fa064baa9))
* add Debian 11 Bullseye & update `yamllint` configuration [skip ci] ([ac1d3b9](ac1d3b9a2d))

### Tests

* **_mapdata:** add AlmaLinux verification file [skip ci] ([42d6487](42d64870e3))
* **_mapdata:** update verification files for `master_type: str` ([c16e7a3](c16e7a3b75))
* **pkgs_spec:** fix latest rubocop violations [skip ci] ([f64197a](f64197ada4))

fix(Defaults) master_type: str

Use the following command:

```
$ GREP_SED="^\(\s\+master_type: \)true" \
  && grep -rl "${GREP_SED}" test/integration/ \
  | xargs sed -i -e "/${GREP_SED}/s//\1str/"
```

Having it set as true causes an error with the minion config when the salt-minion starts

```
Offenses:

test/integration/v3000-py2/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3000-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3001-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3002-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3003-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^

19 files inspected, 5 offenses detected, 5 offenses auto-correctable
```

* Automated using https://github.com/myii/ssf-formula/pull/364