Merge branch 'master' into flagfixes12

2016-04-12 18:44:06 -07:00 · 2016-04-12 18:44:06 -07:00 · 107da007b1
commit 107da007b1
parent fb980e4542 5691086ba2
1 changed files with 8 additions and 0 deletions
--- a/roles/coreos-bootstrap/tasks/main.yml
+++ b/roles/coreos-bootstrap/tasks/main.yml
@ -38,3 +38,11 @@
  pip:
    name: "{{ item }}"
  with_items: pip_python_modules
+
+- name: Check configured hostname
+  shell: hostname
+  register: configured_hostname
+
+- name: Assign inventory name to unconfigured hostnames
+  shell: sh -c "echo \"{{inventory_hostname}}\" > /etc/hostname; hostname \"{{inventory_hostname}}\""
+  when: configured_hostname.stdout == 'localhost'