Remove monolithic consul link from consul-release.

[#144556775]

Signed-off-by: Genevieve LEsperance <glesperance@pivotal.io>

jobs/consul_agent/spec

@@ -46,24 +46,6 @@ provides:
   - consul.agent_cert
   - consul.agent_key
 
-- name: consul
-  type: consul
-  properties:
-  - consul.agent.servers.lan
-  - consul.agent.log_level
-  - consul.agent.datacenter
-  - consul.agent.protocol_version
-  - consul.agent.dns_config.allow_stale
-  - consul.agent.dns_config.max_stale
-  - consul.agent.dns_config.recursor_timeout
-  - consul.agent.domain
-  - consul.ca_cert
-  - consul.server_cert
-  - consul.server_key
-  - consul.agent_cert
-  - consul.agent_key
-  - consul.encrypt_keys
-
 consumes:
 - name: consul_common
   type: consul_common
@@ -77,10 +59,6 @@ consumes:
   type: consul_client
   optional: true
 
-- name: consul
-  type: consul
-  optional: true
-
 properties:
   consul.agent.mode:
     description: "Mode to run the agent in. (client or server)"

jobs/consul_agent/templates/agent.crt.erb

@@ -5,11 +5,7 @@
     respond_to?(:if_link) && if_link("consul_client") do |link|
       agent_cert = link.p("consul.agent_cert")
     end.else do
-      respond_to?(:if_link) && if_link("consul") do |link|
-        agent_cert = link.p("consul.agent_cert")
-      end.else do
-        agent_cert = p("consul.agent_cert")
-      end
+      agent_cert = p("consul.agent_cert")
     end
 
     agent_cert

jobs/consul_agent/templates/agent.key.erb

@@ -5,11 +5,7 @@
     respond_to?(:if_link) && if_link("consul_client") do |link|
       agent_key = link.p("consul.agent_key")
     end.else do
-      respond_to?(:if_link) && if_link("consul") do |link|
-        agent_key = link.p("consul.agent_key")
-      end.else do
-        agent_key = p("consul.agent_key")
-      end
+      agent_key = p("consul.agent_key")
     end
 
     agent_key

jobs/consul_agent/templates/ca.crt.erb

@@ -4,11 +4,7 @@
   respond_to?(:if_link) && if_link("consul_common") do |link|
     ca_cert = link.p("consul.ca_cert")
   end.else do
-    respond_to?(:if_link) && if_link("consul") do |link|
-      ca_cert = link.p("consul.ca_cert")
-    end.else do
-      ca_cert = p("consul.ca_cert")
-    end
+    ca_cert = p("consul.ca_cert")
   end
 
   ca_cert

jobs/consul_agent/templates/consul_link.json.erb

@@ -1,11 +1,6 @@
 <%=
   consul_hash = {}
 
-  respond_to?(:if_link) && if_link('consul') do |consul_link|
-    consul_hash.merge!(consul_link.p('consul'))
-    consul_hash['agent']['servers']['lan'] = consul_link.instances.map(&:address)
-  end
-
   respond_to?(:if_link) && if_link('consul_common') do |consul_link|
     consul_hash.merge!(consul_link.p('consul'))
     consul_hash['agent']['servers']['lan'] = consul_link.instances.map(&:address)

jobs/consul_agent/templates/server.crt.erb

@@ -5,11 +5,7 @@
     respond_to?(:if_link) && if_link("consul_server") do |link|
       server_cert = link.p("consul.server_cert")
     end.else do
-      respond_to?(:if_link) && if_link("consul") do |link|
-        server_cert = link.p("consul.server_cert")
-      end.else do
-        server_cert = p("consul.server_cert")
-      end
+      server_cert = p("consul.server_cert")
     end
 
     server_cert

jobs/consul_agent/templates/server.key.erb

@@ -5,11 +5,7 @@
     respond_to?(:if_link) && if_link("consul_server") do |link|
       server_key = link.p("consul.server_key")
     end.else do
-      respond_to?(:if_link) && if_link("consul") do |link|
-        server_key = link.p("consul.server_key")
-      end.else do
-        server_key = p("consul.server_key")
-      end
+      server_key = p("consul.server_key")
     end
 
     server_key

jobs/consul_agent_windows/spec

@@ -25,10 +25,6 @@ consumes:
   type: consul_client
   optional: true
 
-- name: consul
-  type: consul
-  optional: true
-
 properties:
   consul.agent.servers.lan:
     description: "LAN server addresses to join on start."

jobs/consul_agent_windows/templates/agent.crt.erb

@@ -4,11 +4,7 @@
   respond_to?(:if_link) && if_link("consul_client") do |link|
     agent_cert = link.p("consul.agent_cert")
   end.else do
-    respond_to?(:if_link) && if_link("consul") do |link|
-      agent_cert = link.p("consul.agent_cert")
-    end.else do
-      agent_cert = p("consul.agent_cert")
-    end
+    agent_cert = p("consul.agent_cert")
   end
 
   agent_cert

jobs/consul_agent_windows/templates/agent.key.erb

@@ -4,11 +4,7 @@
   respond_to?(:if_link) && if_link("consul_client") do |link|
     agent_key = link.p("consul.agent_key")
   end.else do
-    respond_to?(:if_link) && if_link("consul") do |link|
-      agent_key = link.p("consul.agent_key")
-    end.else do
-      agent_key = p("consul.agent_key")
-    end
+    agent_key = p("consul.agent_key")
   end
 
   agent_key

jobs/consul_agent_windows/templates/ca.crt.erb

@@ -4,11 +4,7 @@
   respond_to?(:if_link) && if_link("consul_common") do |link|
     ca_cert = link.p("consul.ca_cert")
   end.else do
-    respond_to?(:if_link) && if_link("consul") do |link|
-      ca_cert = link.p("consul.ca_cert")
-    end.else do
-      ca_cert = p("consul.ca_cert")
-    end
+    ca_cert = p("consul.ca_cert")
   end
 
   ca_cert

jobs/consul_agent_windows/templates/consul_link.json.erb

@@ -1,11 +1,6 @@
 <%=
   consul_hash = {}
 
-  respond_to?(:if_link) && if_link('consul') do |consul_link|
-    consul_hash.merge!(consul_link.p('consul'))
-    consul_hash['agent']['servers']['lan'] = consul_link.instances.map(&:address)
-  end
-
   respond_to?(:if_link) && if_link('consul_common') do |consul_link|
     consul_hash.merge!(consul_link.p('consul'))
     consul_hash['agent']['servers']['lan'] = consul_link.instances.map(&:address)