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 /playbooks/init | |
| 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 'playbooks/init')
| -rw-r--r-- | playbooks/init/facts.yml | 2 | ||||
| -rw-r--r-- | playbooks/init/repos.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/init/facts.yml b/playbooks/init/facts.yml index 9e411a551..6759240c9 100644 --- a/playbooks/init/facts.yml +++ b/playbooks/init/facts.yml @@ -13,7 +13,7 @@ # TODO: Should this role be refactored into health_checks?? - name: Run openshift_sanitize_inventory to set variables - include_role: + import_role: name: openshift_sanitize_inventory - name: Detecting Operating System from ostree_booted diff --git a/playbooks/init/repos.yml b/playbooks/init/repos.yml index 866c889b6..667f38ddd 100644 --- a/playbooks/init/repos.yml +++ b/playbooks/init/repos.yml @@ -4,7 +4,7 @@ gather_facts: no tasks: - name: subscribe instances to Red Hat Subscription Manager - include_role: + import_role: name: rhel_subscribe when: - ansible_distribution == 'RedHat' @@ -12,5 +12,5 @@ - rhsub_user is defined - rhsub_pass is defined - name: initialize openshift repos - include_role: + import_role: name: openshift_repos |