Browse Source

tests fixes

tags/0.4
Ales Komarek 9 years ago
parent
commit
cdb1d74ce3
4 changed files with 36 additions and 2 deletions
  1. +3
    -1
      metadata.yml
  2. +1
    -1
      metadata/service/master/cluster.yml
  3. +13
    -0
      tests/pillar/master_single.sls
  4. +19
    -0
      tests/pillar/master_single_reclass.sls

+ 3
- 1
metadata.yml View File

@@ -3,4 +3,6 @@ version: "0.2"
source: "https://github.com/tcpcloud/salt-formula-salt"
dependencies:
- name: git
source: "https://github.com/tcpcloud/salt-formula-git"
source: "https://github.com/tcpcloud/salt-formula-git"
- name: reclass
source: "https://github.com/tcpcloud/salt-formula-reclass"

+ 1
- 1
metadata/service/master/cluster.yml View File

@@ -9,4 +9,4 @@ parameters:
master:
enabled: true
command_timeout: 5
worker_threads: 2
worker_threads: 2

+ 13
- 0
tests/pillar/master_single.sls View File

@@ -1,6 +1,19 @@
git:
client:
enabled: true
linux:
system:
enabled: true
salt:
master:
enabled: true
command_timeout: 5
worker_threads: 2
base_environment: prd
environment:
prd:
formula:
memcached:
source: git
address: 'git@git.domain.com/memcached-formula.git'
revision: master

+ 19
- 0
tests/pillar/master_single_reclass.sls View File

@@ -1,3 +1,15 @@
git:
client:
enabled: true
linux:
system:
enabled: true
reclass:
storage:
data_source:
engine: git
address: 'git...'
branch: master
salt:
master:
enabled: true
@@ -7,3 +19,10 @@ salt:
pillar:
engine: reclass
data_dir: /srv/salt/reclass
environment:
prd:
formula:
memcached:
source: git
address: 'git@git.domain.com/memcached-formula.git'
revision: master

Loading…
Cancel
Save