diff options
| author |   Aaron Smith <aasmith@redhat.com> | 2018-10-05 11:46:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-05 11:46:31 +0000 |
| commit | 28bfd38af164d1b7983c57a0683636bc9a0781fc (patch) | |
| tree | e4d5c78e2366b78ec84a6dfa03fbe0d6b500b10a /docker | |
| parent | ada3bb5cda036c736b460b76552ce47dd8f40aa8 (diff) | |
| parent | ba987198cd381a10b5075eac599fee9d2f6219d9 (diff) | |
Merge "Add role to auto install docker on hosts - missing patch"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ansible/roles/config_files/tasks/mcelog.yml | 2 | ||||
| -rw-r--r-- | docker/ansible/roles/config_files/vars/main.yml | 5 | ||||
| -rw-r--r-- | docker/ansible/roles/run_grafana/vars/main.yml | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/docker/ansible/roles/config_files/tasks/mcelog.yml b/docker/ansible/roles/config_files/tasks/mcelog.yml index bab4b142..794db98c 100644 --- a/docker/ansible/roles/config_files/tasks/mcelog.yml +++ b/docker/ansible/roles/config_files/tasks/mcelog.yml @@ -17,6 +17,7 @@ package: name: mcelog state: present + ignore_errors: "true" when: install_mcelog|default(false)|bool tags: - mcelogs @@ -26,6 +27,7 @@ name: mcelog state: started enabled: true + ignore_errors: "true" when: install_mcelog|default(false)|bool tags: - mcelogs diff --git a/docker/ansible/roles/config_files/vars/main.yml b/docker/ansible/roles/config_files/vars/main.yml index 461bfc3f..cbe64b3c 100644 --- a/docker/ansible/roles/config_files/vars/main.yml +++ b/docker/ansible/roles/config_files/vars/main.yml @@ -23,7 +23,10 @@ interval_value: 10 #network plugin vars network_port: 25826 -network_ip_addr: "{{ (groups['influxdb_hosts']|default({}))[0] | default('localhost') }}" +#get influxdb name as defined in inventory +influxdb_hostname: "{{ (groups['influxdb_hosts']|default({}))[0] | default('localhost') }}" +#get hostname as used by ansible +network_ip_addr: "{{ hostvars[influxdb_hostname].ansible_hostname }}" #prometheus plugin vars prometheus_port: 9103 diff --git a/docker/ansible/roles/run_grafana/vars/main.yml b/docker/ansible/roles/run_grafana/vars/main.yml index 5caf45da..0975b598 100644 --- a/docker/ansible/roles/run_grafana/vars/main.yml +++ b/docker/ansible/roles/run_grafana/vars/main.yml @@ -13,5 +13,5 @@ # limitations under the License. --- -influxdb_hostname: influxdb_host -influxdb_host_ip: "{{ (groups['influxdb_hosts']|default({}))[0] | default('localhost') }}" +influxdb_hostname: localhost +influxdb_host_ip: 127.0.0.1 |