commit 1865e8f0e2d23d63b533e172c9d0b9043429c805
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jul 11 20:07:14 2018 +0000
committer Gerrit Code Review <gerrit2@853267bf53e2> Wed Jul 11 20:07:14 2018 +0000
tree 5dca815ace721620a443abd7f96da0cefed16167
parent 8121150446838ba2b4efcfb112493830f7f01338
parent b97d297ceb2768bafc000942bce23ad8da0f3ccb

Merge "Fix typo salt.control.sizes.stacklight"

docker/swarm/stack/monitoring/alerta.yml

diff --git a/docker/swarm/stack/monitoring/alerta.yml b/docker/swarm/stack/monitoring/alerta.yml
index c0da7d5..858eb38 100644
--- a/docker/swarm/stack/monitoring/alerta.yml
+++ b/docker/swarm/stack/monitoring/alerta.yml
@@ -27,4 +27,5 @@
                 - ${prometheus:alerta:config_dir}/alerta.conf:/web/config.js
               environment:
                 ADMIN_USERS: ${_param:alerta_admin_username}
-                MONGO_URI: ${_param:alerta_mongodb_uri}
\ No newline at end of file
+                ADMIN_PASSWORD: ${_param:alerta_admin_password}
+                MONGO_URI: ${_param:alerta_mongodb_uri}

salt/master/formula/git/saltstack.yml

diff --git a/salt/master/formula/git/saltstack.yml b/salt/master/formula/git/saltstack.yml
index d7dde48..b176a2e 100644
--- a/salt/master/formula/git/saltstack.yml
+++ b/salt/master/formula/git/saltstack.yml
@@ -60,6 +60,9 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-sphinx.git'
               revision: ${_param:salt_master_environment_revision}
+            watchdog:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-watchdog.git'
             xtrabackup:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-xtrabackup.git'

salt/master/formula/pkg/saltstack.yml

diff --git a/salt/master/formula/pkg/saltstack.yml b/salt/master/formula/pkg/saltstack.yml
index 963580c..a682f7f 100644
--- a/salt/master/formula/pkg/saltstack.yml
+++ b/salt/master/formula/pkg/saltstack.yml
@@ -39,6 +39,9 @@
             sphinx:
               source: pkg
               name: salt-formula-sphinx
+            watchdog:
+              source: pkg
+              name: salt-formula-watchdog
             xtrabackup:
               source: pkg
               name: salt-formula-xtrabackup