Add apache include
Since apache site for gnocchi is configured from apache reclass
we need to include apache state to gnocchi formula.
Other changes:
- kitchen 2017.7 is added
Change-Id: Ia59cbde0edd017dd84bebfca7b645a2ea3e6af40
Related-Prod: https://mirantis.jira.com/browse/PROD-17969
diff --git a/.kitchen.yml b/.kitchen.yml
index 1d18119..2a277ae 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -25,7 +25,6 @@
base:
"*":
- linux.system
- - apache
- panko
pillars:
top.sls:
diff --git a/.travis.yml b/.travis.yml
index e90c8eb..71564cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@
env:
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OS_VERSION=pike SUITE=server_cluster
- PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 OS_VERSION=pike SUITE=server_single
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=server_cluster
+ - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 OS_VERSION=pike SUITE=server_single
before_script:
- set -o pipefail
diff --git a/metadata.yml b/metadata.yml
index 4b7a302..5b5ac07 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,6 @@
name: "panko"
version: "2017.6"
source: "https://github.com/salt-formulas/salt-formula-panko"
+dependencies:
+ - name: apache
+ source: "https://github.com/salt-formulas/salt-formula-apache"
diff --git a/panko/server.sls b/panko/server.sls
index f0dadce..8907ebb 100644
--- a/panko/server.sls
+++ b/panko/server.sls
@@ -1,6 +1,9 @@
{%- from "panko/map.jinja" import server with context %}
{%- if server.get('enabled', False) %}
+include:
+- apache
+
panko_server_packages:
pkg.installed:
- names: {{ server.pkgs }}