diff options
author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-08-14 16:20:13 -0400 |
---|---|---|
committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-08-14 16:20:13 -0400 |
commit | 9e46630560431c8fb45db5e12472300731f75e6d (patch) | |
tree | 12b1c1b0876d2627439d8473e0c51e686c93fdae /playbooks | |
parent | 2c558a85ca89018591224bef96f67bb664becee2 (diff) | |
parent | e438f0c19e86241e11853970aa7e94e90c5fffeb (diff) | |
download | openshift-9e46630560431c8fb45db5e12472300731f75e6d.tar.gz openshift-9e46630560431c8fb45db5e12472300731f75e6d.tar.bz2 openshift-9e46630560431c8fb45db5e12472300731f75e6d.tar.xz openshift-9e46630560431c8fb45db5e12472300731f75e6d.zip |
Merge pull request #351 from codificat/vagrantfile-type
Reference deployment_type instead of hardcoding origin
Diffstat (limited to 'playbooks')
-rw-r--r-- | playbooks/byo/rhel_subscribe.yml | 12 | ||||
-rw-r--r-- | playbooks/byo/vagrant.yml | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml new file mode 100644 index 000000000..f564905ea --- /dev/null +++ b/playbooks/byo/rhel_subscribe.yml @@ -0,0 +1,12 @@ +--- +- hosts: all + vars: + openshift_deployment_type: "{{ deployment_type }}" + roles: + - role: rhel_subscribe + when: 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 new file mode 100644 index 000000000..76246e7b0 --- /dev/null +++ b/playbooks/byo/vagrant.yml @@ -0,0 +1,4 @@ +--- +- include: rhel_subscribe.yml + +- include: config.yml |