Remove soledad from ant

1 files changed, 8 insertions, 21 deletions

diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index 5e79950..9a20edf 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -35,20 +35,16 @@ couch:
 development: 
   site_config: true
 dns: 
-  public: true
+  public: false
 domain: 
   full: ant.demo.bitmask.net
   full_suffix: demo.bitmask.net
   internal: ant.demo.bitmask.i
   internal_suffix: demo.bitmask.i
-  name: ant.demo.bitmask.net
+  name: ant.demo.bitmask.i
 enabled: true
 environment: demo
 firewall: 
-  soledad: 
-    from: "*"
-    port: 2323
-    to: "198.252.153.82"
   ssh: 
     from: sysadmin
     port: 4422
@@ -75,20 +71,11 @@ mail:
   smarthost: []
 name: ant
 platform: 
-  major_version: "0.9"
-  version: "0.9"
-service_type: public_service
+  major_version: "0.10"
+  version: "0.10"
+service_type: internal_service
 services: 
   - couchdb
-  - soledad
-soledad: 
-  couchdb_leap_mx_user: 
-    username: leap_mx
-  couchdb_soledad_user: 
-    password: cGqWZqTdFc_fuSZvfPtUTL_7uMA6d5YC
-    salt: 514355e86f1d3fa4de42b677de21281d
-    username: soledad
-  port: 2323
 sources: 
   apt: 
     backports: "http://deb.debian.org/debian/"
@@ -99,18 +86,18 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: origin/version/0.9
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/0.9"
+      basic: "http://deb.leap.se/experimental-platform"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/version/0.8
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: