Remove useless dependency on linux formula
Closes: #19
Change-Id: Icff040a1198221cb6bfa4fddb4b76dd42ebc7590
diff --git a/debian/control b/debian/control
index d6faf77..f6faa8b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@
Maintainer: Michael Kuty <michael.kuty@tcpcloud.eu>
Section: admin
Priority: optional
-Build-Depends: salt-master, python, python-yaml, debhelper (>= 9), salt-master, python, python-yaml, salt-formula-linux
+Build-Depends: salt-master, python, python-yaml, debhelper (>= 9), salt-master, python, python-yaml
Standards-Version: 3.9.6
Homepage: http://www.tcpcloud.eu
Vcs-Browser: https://github.com/tcpcloud/salt-formula-docker
diff --git a/docker/swarm.sls b/docker/swarm.sls
index 992fb71..f1ed6ca 100644
--- a/docker/swarm.sls
+++ b/docker/swarm.sls
@@ -1,5 +1,4 @@
{% from "docker/map.jinja" import swarm with context %}
-{% from "linux/map.jinja" import network with context %}
{%- if swarm.enabled|default(True) %}
include:
@@ -43,7 +42,7 @@
{%- if swarm.get('bind', {}).get('address', None) %} --listen-addr {{ swarm.bind.address }}{% if swarm.bind.port is defined %}:{{ swarm.bind.port }}{% endif %}{%- endif %}
- unless:
- "test -e /var/lib/docker/swarm/state.json"
- - "docker node ls | grep -q '{{ network.hostname }}'"
+ - "docker node ls | grep -q '{{ grains.nodename }}'"
- require:
- service: docker_service
diff --git a/metadata.yml b/metadata.yml
index ac47bec..d54a144 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,6 +1,3 @@
name: "docker"
version: "0.2"
source: "https://github.com/salt-formulas/salt-formula-docker"
-dependencies:
-- name: linux
- source: "https://github.com/salt-formulas/salt-formula-linux"
\ No newline at end of file