diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-11 11:58:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-11 11:58:16 +0000 |
| commit | 44357460b86f21fdd82dca4e3b86876bcf989a99 (patch) | |
| tree | c40900a6f2b8b6513289163e56342d349713cc8c | |
| parent | 37b95f2ade4a542580f267d709d82053671ee450 (diff) | |
| parent | a479afac4aa2a08fd51b1871c55fdd9dd24dc220 (diff) | |
| download | kolla-44357460b86f21fdd82dca4e3b86876bcf989a99.tar.gz kolla-44357460b86f21fdd82dca4e3b86876bcf989a99.zip | |
Merge "Use inventory_hostname for Ceph bootstrap"
| -rw-r--r-- | ansible/roles/ceph/tasks/bootstrap_mons.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/ceph/tasks/generate_cluster.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/ceph/tasks/bootstrap_mons.yml b/ansible/roles/ceph/tasks/bootstrap_mons.yml index 863069485..2200c4f98 100644 --- a/ansible/roles/ceph/tasks/bootstrap_mons.yml +++ b/ansible/roles/ceph/tasks/bootstrap_mons.yml @@ -19,7 +19,7 @@ register: ceph_mon_config_volume - name: Writing hostname of host with existing cluster files to temp file - local_action: copy content={{ ansible_hostname }} dest=/tmp/kolla_ceph_cluster mode=0600 + local_action: copy content="{{ inventory_hostname }}" dest=/tmp/kolla_ceph_cluster mode=0600 changed_when: False always_run: True when: not ceph_mon_config_volume.changed diff --git a/ansible/roles/ceph/tasks/generate_cluster.yml b/ansible/roles/ceph/tasks/generate_cluster.yml index 77ac8dc94..beb78e587 100644 --- a/ansible/roles/ceph/tasks/generate_cluster.yml +++ b/ansible/roles/ceph/tasks/generate_cluster.yml @@ -25,4 +25,4 @@ - name: Setting host for cluster files set_fact: - delegate_host: "{{ ansible_hostname }}" + delegate_host: "{{ inventory_hostname }}" |