summaryrefslogtreecommitdiffstats
path: root/playbooks/byo
diff options
context:
space:
mode:
authorPep TurrĂ³ Mauri <pep@redhat.com>2015-08-03 16:29:25 +0200
committerPep TurrĂ³ Mauri <pep@redhat.com>2015-08-03 17:11:59 +0200
commit3548472edd08d09fafcb236790a44bcf31aa5f03 (patch)
tree06869ee7389f800ae19433483ad12cb72de071ad /playbooks/byo
parent5d7753a8ecb03634f045b057dc33369178615f92 (diff)
downloadopenshift-3548472edd08d09fafcb236790a44bcf31aa5f03.tar.gz
openshift-3548472edd08d09fafcb236790a44bcf31aa5f03.tar.bz2
openshift-3548472edd08d09fafcb236790a44bcf31aa5f03.tar.xz
openshift-3548472edd08d09fafcb236790a44bcf31aa5f03.zip
Move rhel_subscribe tasks to its own playbook
Allows reuse out of vagrant, e.g. to subscribe systems by its own
Diffstat (limited to 'playbooks/byo')
-rw-r--r--playbooks/byo/rhel_subscribe.yml12
-rw-r--r--playbooks/byo/vagrant.yml12
2 files changed, 13 insertions, 11 deletions
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml
new file mode 100644
index 000000000..60300c3dc
--- /dev/null
+++ b/playbooks/byo/rhel_subscribe.yml
@@ -0,0 +1,12 @@
+---
+- hosts: all
+ vars:
+ deployment_type: "{{ openshift_deployment_type }}"
+ roles:
+ - role: rhel_subscribe
+ when: openshift_deployment_type == "enterprise" and
+ ansible_distribution == "RedHat" and
+ lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
+ default('no', True) | lower in ['no', 'false']
+ - openshift_repos
+ - os_update_latest
diff --git a/playbooks/byo/vagrant.yml b/playbooks/byo/vagrant.yml
index c89f8775b..76246e7b0 100644
--- a/playbooks/byo/vagrant.yml
+++ b/playbooks/byo/vagrant.yml
@@ -1,14 +1,4 @@
---
-- hosts: all
- vars:
- deployment_type: "{{ openshift_deployment_type }}"
- roles:
- - role: rhel_subscribe
- when: openshift_deployment_type == "enterprise" and
- ansible_distribution == "RedHat" and
- lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
- default('no', True) | lower in ['no', 'false']
- - openshift_repos
- - os_update_latest
+- include: rhel_subscribe.yml
- include: config.yml