diff options
author | Scott Dodson <sdodson@redhat.com> | 2018-01-05 16:19:23 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-05 16:19:23 -0500 |
commit | 31d19c5e68e61d004a93db738772c120e7dd0eb5 (patch) | |
tree | 1b5a2642ca9645ab97aa79cd1ca36537d8b64f8c /roles/container_runtime/tasks | |
parent | caec381b6cd0ea632cfe927c23b6229ab69e834a (diff) | |
parent | eacc12897ca86a255f89b8a4537ce2b7004cf319 (diff) | |
download | openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.gz openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.bz2 openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.tar.xz openshift-31d19c5e68e61d004a93db738772c120e7dd0eb5.zip |
Merge pull request #6627 from sdodson/import_role
Migrate to import_role for static role inclusion
Diffstat (limited to 'roles/container_runtime/tasks')
-rw-r--r-- | roles/container_runtime/tasks/common/post.yml | 2 | ||||
-rw-r--r-- | roles/container_runtime/tasks/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/container_runtime/tasks/common/post.yml b/roles/container_runtime/tasks/common/post.yml index d790eb2c0..b90190ebf 100644 --- a/roles/container_runtime/tasks/common/post.yml +++ b/roles/container_runtime/tasks/common/post.yml @@ -11,7 +11,7 @@ - meta: flush_handlers # This needs to run after docker is restarted to account for proxy settings. -# registry_auth is called directly with include_role in some places, so we +# registry_auth is called directly with import_role in some places, so we # have to put it in the root of the tasks/ directory. - include_tasks: ../registry_auth.yml diff --git a/roles/container_runtime/tasks/main.yml b/roles/container_runtime/tasks/main.yml index 96d8606c6..07da831c4 100644 --- a/roles/container_runtime/tasks/main.yml +++ b/roles/container_runtime/tasks/main.yml @@ -1,2 +1,2 @@ --- -# This role is meant to be used with include_role and tasks_from. +# This role is meant to be used with import_role and tasks_from. |