diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-07 10:42:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-07 10:42:41 +0000 |
| commit | 5b6e1e9e53e3ac85435c81f1dd15c2d40e0b3483 (patch) | |
| tree | b6025e5c6d4ae51ce0747bf917d61469bc1905b6 | |
| parent | 3b8e60079410fc00e26091e09b30047dca3c21f0 (diff) | |
| parent | f66d1fa70922cb8b40d3d59acf9f7ebcd5110b61 (diff) | |
| download | kolla-5b6e1e9e53e3ac85435c81f1dd15c2d40e0b3483.tar.gz kolla-5b6e1e9e53e3ac85435c81f1dd15c2d40e0b3483.zip | |
Merge "Simulate normal ansible behaviour with shared role"
| -rw-r--r-- | ansible/roles/common/defaults/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/main.yml | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml index 0ba35bcb8..e3895f118 100644 --- a/ansible/roles/common/defaults/main.yml +++ b/ansible/roles/common/defaults/main.yml @@ -1,4 +1,8 @@ --- +# Due to the way we do our inventory, ansible does not pick up on the fact that +# this role has already run. We can track what has run with host facts. +common_run: False + #################### # Docker #################### diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index b017e8b4a..e261f83ee 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,2 +1,8 @@ --- - include: "{{ action }}.yml" + when: not common_run + +- name: Registering common role has run + set_fact: + common_run: True + when: not common_run |