3 files changed, 10 insertions, 5 deletions
diff --git a/provider_base/common.json b/provider_base/common.json
index 6d4291c6..b5d37f8e 100644
--- a/provider_base/common.json
+++ b/provider_base/common.json
@@ -1,5 +1,5 @@
 {
-  "ip_address": "REQUIRED",
+  "ip_address": null,
   "services": [],
   "tags": [],
   "domain": {
@@ -14,13 +14,14 @@
   },
   "ssh": {
     "authorized_keys": "= file :authorized_keys",
-    "known_hosts": "= file :known_hosts",
+    "known_hosts": "=> known_hosts_file",
     "port": 22
   },
+  "hosts": "=> hosts_file",
   "x509": {
     "use": false,
-    "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap update-cert`') : nil",
-    "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap update-cert`') : nil",
+    "cert": "= x509.use ? file(:node_x509_cert, :missing => 'x509 certificate for node $node. Run `leap cert update`') : nil",
+    "key": "= x509.use ? file(:node_x509_key, :missing => 'x509 key for node $node. Run `leap cert update`') : nil",
     "ca_cert": "= try_file :ca_cert"
   },
   "local": false
diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json
index 68f970f7..a4ded72b 100644
--- a/provider_base/services/ca.json
+++ b/provider_base/services/ca.json
@@ -1,4 +1,8 @@
 {
+  "ca_daemon": {
+    "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
+    "couchdb_user": "= global.services[:couchdb].couch.users[:ca_daemon]"
+  },
   "service_type": "internal_service",
   "x509": {
     "use": true
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index b04ed684..3eb0ba62 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -1,7 +1,7 @@
 {
   "webapp": {
     "modules": ["user", "billing", "help"],
-    "couchdb_hosts": "= nodes[:services => :couchdb][:local => local].field('domain.name')",
+    "couchdb_hosts": "= hostnames nodes[:services => :couchdb][:local => local]",
     "couchdb_user": "= global.services[:couchdb].couch.users[:webapp]"
   },
   "definition_files": {