diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-14 17:33:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 17:33:28 -0500 |
| commit | 8190c1c8e4f300267405a0628e466167a09d8b59 (patch) | |
| tree | e0c02709b48f9a7593ebd162dd35f772339c0ec5 /playbooks/init | |
| parent | 579a246138b20356cc9d0eab33f7880514bf4d87 (diff) | |
| parent | fe801cb7fbf983ef397257117da30ce4ccc938b4 (diff) | |
| download | openshift-8190c1c8e4f300267405a0628e466167a09d8b59.tar.gz openshift-8190c1c8e4f300267405a0628e466167a09d8b59.tar.bz2 openshift-8190c1c8e4f300267405a0628e466167a09d8b59.tar.xz openshift-8190c1c8e4f300267405a0628e466167a09d8b59.zip | |
Merge pull request #6483 from mgugino-upstream-stage/fix-repos
Move repo and subscribe to prerequisites
Diffstat (limited to 'playbooks/init')
| -rw-r--r-- | playbooks/init/main.yml | 2 | ||||
| -rw-r--r-- | playbooks/init/repos.yml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/playbooks/init/main.yml b/playbooks/init/main.yml index b2b972a7d..06e8ba504 100644 --- a/playbooks/init/main.yml +++ b/playbooks/init/main.yml @@ -23,8 +23,6 @@ - import_playbook: validate_hostnames.yml when: not (skip_validate_hostnames | default(False)) -- import_playbook: repos.yml - - import_playbook: version.yml when: not (skip_verison | default(False)) diff --git a/playbooks/init/repos.yml b/playbooks/init/repos.yml index 4967b8f13..048b09e60 100644 --- a/playbooks/init/repos.yml +++ b/playbooks/init/repos.yml @@ -9,8 +9,8 @@ when: - ansible_distribution == 'RedHat' - deployment_type == 'openshift-enterprise' - - (rhel_subscription_user or rhsub_user) is defined - - (rhel_subscription_password or rhsub_pass) is defined + - rhsub_user | default(False) + - rhsub_pass | default(False) - name: initialize openshift repos include_role: name: openshift_repos |