diff options
| -rw-r--r-- | provider_base/common.json | 3 | ||||
| -rw-r--r-- | provider_base/services/ca.json | 2 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/provider_base/common.json b/provider_base/common.json index 6d4291c6..42444b1f 100644 --- a/provider_base/common.json +++ b/provider_base/common.json @@ -14,9 +14,10 @@ }, "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", diff --git a/provider_base/services/ca.json b/provider_base/services/ca.json index 800c995d..a4ded72b 100644 --- a/provider_base/services/ca.json +++ b/provider_base/services/ca.json @@ -1,6 +1,6 @@ { "ca_daemon": { - "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[:ca_daemon]" }, "service_type": "internal_service", 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": { |