diff options
| author | Patrick Uiterwijk <puiterwijk@redhat.com> | 2017-08-16 17:41:49 +0000 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2017-08-16 17:41:49 +0000 |
| commit | e2b829c900e0639fbeb3dedd8c5fef021cdcd521 (patch) | |
| tree | 5e012dc80409c9f560a546509e6d63d2ed9fdbc1 | |
| parent | 0f68548855802e18a3ce216f307c974ab204a7eb (diff) | |
| download | ansible-e2b829c900e0639fbeb3dedd8c5fef021cdcd521.tar.gz ansible-e2b829c900e0639fbeb3dedd8c5fef021cdcd521.tar.xz ansible-e2b829c900e0639fbeb3dedd8c5fef021cdcd521.zip | |
Turns out name: is incompatible with include_role
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
| -rw-r--r-- | roles/base/tasks/main.yml | 3 | ||||
| -rw-r--r-- | tasks/persistent_cloud.yml | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 80897d55f..1a5763e91 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -104,8 +104,7 @@ - base when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined -- name: Set up SSH - include_role: basessh +- include_role: basessh - name: make sure hostname is set right on rhel7 hosts hostname: name="{{inventory_hostname}}" diff --git a/tasks/persistent_cloud.yml b/tasks/persistent_cloud.yml index a0e21b148..ad19a9ecd 100644 --- a/tasks/persistent_cloud.yml +++ b/tasks/persistent_cloud.yml @@ -28,8 +28,7 @@ register: nova_result when: host_is_up|failed -- name: Deploy SSH config - include_role: basessh +- include_role: basessh # instance can be both id and name, volume must be id # volume must be id |