Commit graph

425 commits

Author SHA1 Message Date
Imran Iqbal
aa008e6e5e
Merge pull request #115 from alxwr/fix-merge
fix(`map.jinja`): _merge_ defaults and `config.get`
2019-05-15 20:42:25 +01:00
Alexander Weidinger
91bc2f046b fix(map.jinja): _merge_ defaults and config.get
test resulting config
2019-05-15 21:27:06 +02:00
semantic-release-bot
5eced87a6a chore(release): 2.1.5 [skip ci]
## [2.1.5](https://github.com/saltstack-formulas/template-formula/compare/v2.1.4...v2.1.5) (2019-05-15)

### Bug Fixes

* **`map.jinja`:** use tplroot ([b9c5e03](https://github.com/saltstack-formulas/template-formula/commit/b9c5e03))
2019-05-15 16:41:11 +00:00
Imran Iqbal
c58fa7c26b
Merge pull request #114 from alxwr/master
map.jinja: use tplroot
2019-05-15 17:20:43 +01:00
Alexander Weidinger
b9c5e030bc fix(map.jinja): use tplroot
When updating a formula the following should be sufficient:

```
cp template-formula/template/map.jinja my-formula/my/map.jinja
sed -i '/set template =/set my =/' my-formula/my/map.jinja
```

Based on the work of @myii!
2019-05-15 18:18:40 +02:00
semantic-release-bot
f4c7226964 chore(release): 2.1.4 [skip ci]
## [2.1.4](https://github.com/saltstack-formulas/template-formula/compare/v2.1.3...v2.1.4) (2019-05-15)

### Bug Fixes

* **`map.jinja`:** remove `merge` from `config.get` (for `salt-ssh`) ([00e474c](https://github.com/saltstack-formulas/template-formula/commit/00e474c)), closes [#95](https://github.com/saltstack-formulas/template-formula/issues/95)
2019-05-15 15:10:54 +00:00
alxwr
5311bd59a6
Merge pull request #102 from myii/bug/fix-map-for-salt-ssh
fix(`map.jinja`): use pillar/config `.get` according to `__cli` option
2019-05-15 16:54:55 +02:00
Imran Iqbal
00e474cdc2
fix(map.jinja): remove merge from config.get (for salt-ssh)
* `merge` not available via. `salt-ssh`
* Additionally, fix 5dc0b86 in #95
    - No option `merge=True` for `config.get`
2019-05-15 15:37:02 +01:00
semantic-release-bot
147760d19f chore(release): 2.1.3 [skip ci]
## [2.1.3](https://github.com/saltstack-formulas/template-formula/compare/v2.1.2...v2.1.3) (2019-05-13)

### Bug Fixes

* **travis:** don't install gems twice ([925d8e2](https://github.com/saltstack-formulas/template-formula/commit/925d8e2))

### Documentation

* **readme:** add testing section based on `postgres-formula` ([c309d5f](https://github.com/saltstack-formulas/template-formula/commit/c309d5f))
2019-05-13 17:25:10 +00:00
Nicolas Rodriguez
7aa7df85a1
Merge pull request #109 from myii/docs/add-testing-section
docs(readme): add testing section based on `postgres-formula`
2019-05-13 18:17:57 +02:00
Javier Bértoli
ad62c85e59
Merge pull request #108 from n-rodriguez/wip/bundle
fix(travis): don't install gems twice
2019-05-13 13:16:55 -03:00
semantic-release-bot
27e3be7b17 chore(release): 2.1.2 [skip ci]
## [2.1.2](https://github.com/saltstack-formulas/template-formula/compare/v2.1.1...v2.1.2) (2019-05-13)

### Bug Fixes

* **gitignore:** add Gemfile.lock to .gitignore ([87fa410](https://github.com/saltstack-formulas/template-formula/commit/87fa410))
2019-05-13 16:08:17 +00:00
Imran Iqbal
2727e634a3
Merge pull request #107 from n-rodriguez/wip/gitignore
fix(gitignore): add Gemfile.lock to .gitignore
2019-05-13 16:10:54 +01:00
Imran Iqbal
c309d5f683
docs(readme): add testing section based on postgres-formula 2019-05-13 16:04:05 +01:00
Nicolas Rodriguez
925d8e2dc8 fix(travis): don't install gems twice 2019-05-13 16:33:23 +02:00
Nicolas Rodriguez
87fa4100a5 fix(gitignore): add Gemfile.lock to .gitignore 2019-05-13 15:51:11 +02:00
semantic-release-bot
635571b2c5 chore(release): 2.1.1 [skip ci]
## [2.1.1](https://github.com/saltstack-formulas/template-formula/compare/v2.1.0...v2.1.1) (2019-05-13)

### Documentation

* **semantic-release:** add list of semantic-release compatible formulas ([97b19b9](https://github.com/saltstack-formulas/template-formula/commit/97b19b9))
2019-05-13 01:26:14 +00:00
John Keates
36df2a3a19
Merge pull request #106 from n-rodriguez/wip/doc
docs(semantic-release): add list of semantic-release compatible formulas
2019-05-13 03:04:15 +02:00
Nicolas Rodriguez
97b19b9af0 docs(semantic-release): add list of semantic-release compatible formulas 2019-05-13 02:31:46 +02:00
semantic-release-bot
abcb789063 chore(release): 2.1.0 [skip ci]
# [2.1.0](https://github.com/saltstack-formulas/template-formula/compare/v2.0.6...v2.1.0) (2019-05-12)

### Features

* **centos-6:** reshape formula and tests for this platform ([a4b1608](https://github.com/saltstack-formulas/template-formula/commit/a4b1608)), closes [#104](https://github.com/saltstack-formulas/template-formula/issues/104)
2019-05-12 20:19:17 +00:00
Javier Bértoli
f07aaf9aef
Merge pull request #105 from myii/feature/enable-centos-6
feat(centos-6): reshape formula and tests for this platform
2019-05-12 17:00:38 -03:00
Imran Iqbal
a4b1608ab4
feat(centos-6): reshape formula and tests for this platform
* Close #104
2019-05-12 16:22:41 +01:00
semantic-release-bot
b0d6aa1f8c chore(release): 2.0.6 [skip ci]
## [2.0.6](https://github.com/saltstack-formulas/template-formula/compare/v2.0.5...v2.0.6) (2019-05-02)

### Continuous Integration

* **kitchen+travis:** use latest pre-salted images ([91ef13b](https://github.com/saltstack-formulas/template-formula/commit/91ef13b))

### Tests

* **inspec:** disable `service`-based tests for `opensuse-leap-15` ([848c2ad](https://github.com/saltstack-formulas/template-formula/commit/848c2ad))
2019-05-02 16:08:41 +00:00
Javier Bértoli
a2e4982276
Merge pull request #101 from myii/chore/use-latest-pre-salted-images
ci(kitchen+travis): use latest pre-salted images
2019-05-02 12:47:48 -03:00
Imran Iqbal
848c2ad2c7
test(inspec): disable service-based tests for opensuse-leap-15 2019-05-02 16:21:09 +01:00
Imran Iqbal
91ef13b1e1
ci(kitchen+travis): use latest pre-salted images
* Add `suse` to `inspec.yml` for `opensuse-leap-15`
2019-05-02 16:21:08 +01:00
semantic-release-bot
3a83a69198 chore(release): 2.0.5 [skip ci]
## [2.0.5](https://github.com/saltstack-formulas/template-formula/compare/v2.0.4...v2.0.5) (2019-04-30)

### Documentation

* **tofs:** remove whitespace from blank line ([0881b7d](https://github.com/saltstack-formulas/template-formula/commit/0881b7d))
2019-04-30 15:10:42 +00:00
Imran Iqbal
e6a41be2d3
Merge pull request #100 from saltstack-formulas/myii-patch-1
docs(tofs): remove whitespace from blank line
2019-04-30 15:49:30 +01:00
Imran Iqbal
0881b7daf1
docs(tofs): remove whitespace from blank line 2019-04-30 15:49:16 +01:00
semantic-release-bot
809207e7f2 chore(release): 2.0.4 [skip ci]
## [2.0.4](https://github.com/saltstack-formulas/template-formula/compare/v2.0.3...v2.0.4) (2019-04-27)

### Code Refactoring

* **map:** use `config.get` instead of `pillar.get` ([5dc0b86](https://github.com/saltstack-formulas/template-formula/commit/5dc0b86))

### Continuous Integration

* **gemfile:** update `kitchen-salt` version ([ad31c32](https://github.com/saltstack-formulas/template-formula/commit/ad31c32))
2019-04-27 08:12:06 +00:00
Imran Iqbal
24bf7d0681
Merge pull request #95 from myii/refactor/map-config-get
refactor(map): use `config.get` instead of `pillar.get`
2019-04-27 08:58:30 +01:00
Imran Iqbal
594e322471
Merge pull request #99 from myii/chore/gitignore-kitchen.local.yml
chore(gitignore): add `kitchen.local.yml`
2019-04-27 02:50:28 +01:00
Imran Iqbal
fe9eae0841
chore(gitignore): add kitchen.local.yml
* Alongside commit: 3860bf9
* Quoting from https://kitchen.ci/docs/getting-started/kitchen-yml/:
  - As of test-kitchen 1.21.0, we now prefer `kitchen.yml` over `.kitchen.yml`.
  - This preference applies to `kitchen.local.yml` as well.
  - This is backward compatible so the dot versions continue to work.
2019-04-27 02:48:21 +01:00
Imran Iqbal
dced1ebc92
Merge pull request #96 from myii/chore/update-gemfile
ci(gemfile): update `kitchen-salt` version
2019-04-25 02:42:16 +01:00
Imran Iqbal
ad31c32b06
ci(gemfile): update kitchen-salt version 2019-04-25 02:41:24 +01:00
Imran Iqbal
5dc0b86b22
refactor(map): use config.get instead of pillar.get 2019-04-25 00:02:33 +01:00
semantic-release-bot
34d235a757 chore(release): 2.0.3 [skip ci]
## [2.0.3](https://github.com/saltstack-formulas/template-formula/compare/v2.0.2...v2.0.3) (2019-04-24)

### Bug Fixes

* **comments:** explain that at least an empty dict is required ([426f955](https://github.com/saltstack-formulas/template-formula/commit/426f955)), closes [#93](https://github.com/saltstack-formulas/template-formula/issues/93)

### Continuous Integration

* **kitchen:** use pre-salted images instead ([2855ed6](https://github.com/saltstack-formulas/template-formula/commit/2855ed6))
2019-04-24 13:11:00 +00:00
Imran Iqbal
3caf138eb5
Merge pull request #94 from myii/bug/fix-yaml-comments
fix(comments): explain that at least an empty dict is required
2019-04-24 13:55:24 +01:00
Imran Iqbal
426f955a79
fix(comments): explain that at least an empty dict is required
* For all `os*map.yaml` files
* Remove redundant `or {}` from `map.jinja`
* Close #93
2019-04-24 08:25:52 +01:00
Éric Veiras Galisson
a741a473c7
Merge pull request #92 from myii/chore/use-salted-ci-images
ci(kitchen): use pre-salted images instead
2019-04-23 15:11:19 +02:00
Javier Bértoli
2855ed6cf1
ci(kitchen): use pre-salted images instead 2019-04-23 12:38:16 +01:00
semantic-release-bot
a3ebe2b26e chore(release): 2.0.2 [skip ci]
## [2.0.2](https://github.com/saltstack-formulas/template-formula/compare/v2.0.1...v2.0.2) (2019-04-22)

### Code Refactoring

* **config_clean:** remove unused import from `libtofs.jinja` ([b7cb585](https://github.com/saltstack-formulas/template-formula/commit/b7cb585))

### Continuous Integration

* **kitchen+travis:** implement new distro-python-salt_version matrix ([bd4792d](https://github.com/saltstack-formulas/template-formula/commit/bd4792d))
2019-04-22 05:04:55 +00:00
Imran Iqbal
5ffbf6b940
Merge pull request #90 from saltstack-formulas/myii-patch-1
refactor(config_clean): remove unused import from `libtofs.jinja`
2019-04-22 05:46:49 +01:00
Imran Iqbal
b7cb5857c5
refactor(config_clean): remove unused import from libtofs.jinja 2019-04-22 05:08:09 +01:00
Niels Abspoel
250a1c4d29
Merge pull request #89 from myii/feature/use-new-ci-matrix
ci(kitchen+travis): implement new distro-python-salt_version matrix
2019-04-20 14:11:10 +02:00
Imran Iqbal
bd4792d260
ci(kitchen+travis): implement new distro-python-salt_version matrix
* Based on: https://github.com/saltstack-formulas/salt-formula/pull/406
2019-04-20 10:57:33 +01:00
semantic-release-bot
0dab08d553 chore(release): 2.0.1 [skip ci]
## [2.0.1](https://github.com/saltstack-formulas/template-formula/compare/v2.0.0...v2.0.1) (2019-03-25)

### Code Refactoring

* **tofs:** ensure (v2 > v1 > default) checking for `src_files` ([3e62d7b](https://github.com/saltstack-formulas/template-formula/commit/3e62d7b))
* **tofs:** make `files_switch` macro fully portable ([a98b777](https://github.com/saltstack-formulas/template-formula/commit/a98b777))
* **tofs:** use `config` rather than `pillar` throughout ([5730e94](https://github.com/saltstack-formulas/template-formula/commit/5730e94))
2019-03-25 22:45:40 +00:00
Niels Abspoel
0d451359c4
Merge pull request #83 from myii/refactor/libtofs
refactor(tofs): update with latest changes inc. 100% portable `libtofs.jinja`
2019-03-25 23:27:28 +01:00
Imran Iqbal
3e62d7b047
refactor(tofs): ensure (v2 > v1 > default) checking for src_files 2019-03-24 03:45:36 +00:00
Imran Iqbal
5730e94d46
refactor(tofs): use config rather than pillar throughout 2019-03-24 03:44:07 +00:00