Merge pull request #10 from nzlosh/master

Aligned Agent Service files with Consul API.

Author: nzlosh

actions/service_deregister.py actions/agent_service_deregister.pyactions/service_deregister.py renamed to actions/agent_service_deregister.py

@@ -3,4 +3,4 @@
 
 class ConsulServiceDeregisterAction(action.ConsulBaseAction):
     def run(self, service_id):
-        return (True, self.consul.service.deregister(service_id=service_id))
+        return (True, self.consul.agent.service.deregister(service_id=service_id))

actions/service_deregister.yaml actions/agent_service_deregister.yamlactions/service_deregister.yaml renamed to actions/agent_service_deregister.yaml

@@ -2,7 +2,7 @@ name: service_deregister
 runner_type: python-script
 description: "Remove a service from the local agent."
 enabled: true
-entry_point: "service_deregister.py"
+entry_point: "agent_service_deregister.py"
 parameters:
     service_id:
         type: string

actions/service_maintenance.py actions/agent_service_maintenance.pyactions/service_maintenance.py renamed to actions/agent_service_maintenance.py

@@ -3,7 +3,7 @@
 
 class ConsulServiceMaintenanceAction(action.ConsulBaseAction):
     def run(self, service_id, enable, reason=None):
-        return (True, self.consul.service.maintenance(
+        return (True, self.consul.agent.service.maintenance(
             service_id=service_id,
             enable=enable,
             reason=reason

actions/service_maintenance.yaml actions/agent_service_maintenance.yamlactions/service_maintenance.yaml renamed to actions/agent_service_maintenance.yaml

@@ -2,7 +2,7 @@ name: service_maintenance
 runner_type: python-script
 description: "Put a given service into _maintenance mode_."
 enabled: true
-entry_point: "service_maintenance.py"
+entry_point: "agent_service_maintenance.py"
 parameters:
     service_id:
         type: string

actions/service_register.py actions/agent_service_register.pyactions/service_register.py renamed to actions/agent_service_register.py

@@ -11,7 +11,7 @@ def run(self,
             check=None,
             token=None,
             enable_tag_override=False):
-        return (True, self.consul.service.register(
+        return (True, self.consul.agent.service.register(
             name=name,
             service_id=service_id,
             address=address,

actions/service_register.yaml actions/agent_service_register.yamlactions/service_register.yaml renamed to actions/agent_service_register.yaml

@@ -2,7 +2,7 @@ name: service_register
 runner_type: python-script
 description: "Add a new service to the local agent."
 enabled: true
-entry_point: "service_register.py"
+entry_point: "agent_service_register.py"
 parameters:
     name:
         type: string