Merge pull request #11 from SODALITE-EU/fix/node_exporter

Fixed node_exporter consul registration

openstack/openstack_vm.yaml

@@ -65,7 +65,7 @@ node_types:
       consul_server_address:
         description: Public IPv4 address of the consul server (for the node exporter to register into)
         type: string
-        default: "/tmp"
+        default: ""
         required: false
       env:
         description: Optional OpenStack environment
@@ -117,7 +117,7 @@ node_types:
               primary: playbooks/vm_create.yml 
               dependencies:
                 - playbooks/egi_refresh_token.yml
-                - playbooks/node_exporter.json.j2
+                - artifacts/node_exporter.json.j2
           delete:  
             inputs:  
               id:                       { type: string, default: { get_attribute: [ SELF, id ] } } 

openstack/playbooks/vm_create.yml

@@ -58,11 +58,15 @@
           -o StrictHostKeyChecking=no
           {{ additional_ssh_args | default("") }}
         id: "{{ server_info.server.id }}"
-        public_adress: "{{ server_info.server.public_v4 }}"
+        public_address: "{{ server_info.server.public_v4 }}"
 
 
 - hosts: vms
   gather_facts: no
+  vars:
+    public_address: "{{ hostvars.server.public_address }}"
+    id: "{{ hostvars.server.id }}"
+
   tasks:
     - name: Wait for ssh to wake up
       wait_for_connection:
@@ -178,3 +182,4 @@
 
     - name: Register node-exporter in Consul server
       shell: curl --request PUT --data @/tmp/node_exporter.json http://{{ consul_server_address|quote }}:8500/v1/agent/service/register
+      when: consul_server_address != ""