Skip to content

Commit

Permalink
feat(formula): add devstack-formula
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Sep 2, 2020
1 parent a3208c2 commit 8275af2
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 4 deletions.
1 change: 1 addition & 0 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ ssf:
- consul
- cron
- deepsea
- devstack
- dhcpd
- django
- docker
Expand Down
13 changes: 11 additions & 2 deletions ssf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ ssf_node_anchors:
# An alternative method could be to use:
# `git describe --abbrev=0 --tags`
# yamllint disable rule:line-length rule:quoted-strings
title: "ci(kitchen+travis): use latest pre-salted images"
body: '* Automated using https://github.com/myii/ssf-formula/pull/245'
title: "chore: standardise structure"
body: '* Checked using https://github.com/myii/ssf-formula/pull/248'
# yamllint enable rule:line-length rule:quoted-strings
github:
owner: 'saltstack-formulas'
Expand Down Expand Up @@ -421,6 +421,15 @@ ssf:
consul: *formula_default
cron: *formula_default
deepsea: *formula_default
devstack:
<<: *formula_default
context:
<<: *context_default
inspec_suites_kitchen:
<<: *isk_default
0:
<<: *isk_suite_default
name: 'ubuntu'
dhcpd: *formula_default
django: *formula_default
docker: *formula_default
Expand Down
2 changes: 1 addition & 1 deletion ssf/files/default/kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ platforms:

provisioner:
name: salt_solo
log_level: debug
log_level: {{ 'info' if semrel_formula in ['devstack'] else 'debug' }}
salt_install: none
require_chef: false
formula: {{ semrel_formula }}
Expand Down
15 changes: 15 additions & 0 deletions ssf/files/tofs_devstack-formula/.salt-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
---
exclude_paths: []
rules: {}
skip_list:
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
- 205 # Use ".sls" as a Salt State file extension
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
- 206 # local.conf, stackrc, openrc need this off
- 207 # File modes should always be encapsulated in quotation marks
- 208 # File modes should always contain a leading zero
tags: []
verbosity: 1
3 changes: 2 additions & 1 deletion ssf/files/tofs_template-formula/docs/CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ These formulas are already compatible with semantic-release *and* have global ``
#. `arvados-formula <https://github.com/saltstack-formulas/arvados-formula>`_
#. `bind-formula <https://github.com/saltstack-formulas/bind-formula>`_
#. `deepsea-formula <https://github.com/saltstack-formulas/deepsea-formula>`_
#. `devstack-formula <https://github.com/saltstack-formulas/devstack-formula>`_
#. `dhcpd-formula <https://github.com/saltstack-formulas/dhcpd-formula>`_
#. `eclipse-formula <https://github.com/saltstack-formulas/eclipse-formula>`_
#. `fail2ban-formula <https://github.com/saltstack-formulas/fail2ban-formula>`_
Expand Down Expand Up @@ -216,7 +217,7 @@ These formulas are already compatible with semantic-release *and* have global ``

These formulas are also compatible with semantic-release:

51. `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_
52. `apache-formula <https://github.com/saltstack-formulas/apache-formula>`_
#. `apt-cacher-formula <https://github.com/saltstack-formulas/apt-cacher-formula>`_
#. `cert-formula <https://github.com/saltstack-formulas/cert-formula>`_
#. `chrony-formula <https://github.com/saltstack-formulas/chrony-formula>`_
Expand Down
36 changes: 36 additions & 0 deletions ssf/formulas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,42 @@ ssf:
- [fedora , 31 , 2019.2, 3, default]
use_tofs: true
semrel_files: *semrel_files_default
devstack:
context:
codeowners:
entries:
global:
- '*': '@noelmcloughlin'
git:
github:
repo: 'devstack-formula'
inspec_suites_kitchen:
0:
inspec_yml:
summary: >-
Verify that the devstack formula is setup and configured correctly
provisioner:
pillars_from_files:
- .sls: 'test/salt/pillar/ubuntu.sls'
inspec_suites_matrix:
- ubuntu
platforms: *platforms_os_ubuntu_new
platforms_matrix:
# [os , os_ver, salt_ver, py_ver, inspec_suite]
# # - [ubuntu , 20.04, master, 3, ubuntu]
- [ubuntu , 18.04, master, 3, ubuntu]
# - [ubuntu , 18.04, 3000.3, 3, ubuntu]
- [ubuntu , 18.04, 3000.3, 2, ubuntu]
# # - [ubuntu , 16.04, 3000.3, 2, ubuntu]
# - [ubuntu , 18.04, 2019.2, 3, ubuntu]
# # - [ubuntu , 16.04, 2019.2, 3, ubuntu]
use_libsaltcli: true
use_tofs: true
yamllint:
ignore:
additional:
- pillar.example
semrel_files: *semrel_files_default
dhcpd:
context:
codeowners:
Expand Down

0 comments on commit 8275af2

Please sign in to comment.