diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-22 18:10:17 -0300 |
| commit | 055921cd545c12733949f37c1af2c0a1296216ec (patch) | |
| tree | 0ad645b9a75eacbb168c9fdc92d585867b5317a4 /playbooks/byo | |
| parent | 10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (diff) | |
| parent | 922b87ede66f6b7e376d1f46e13327077cd41719 (diff) | |
| download | openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.gz openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.bz2 openshift-055921cd545c12733949f37c1af2c0a1296216ec.tar.xz openshift-055921cd545c12733949f37c1af2c0a1296216ec.zip | |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'playbooks/byo')
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/byo/rhel_subscribe.yml | 12 | ||||
| -rw-r--r-- | playbooks/byo/vagrant.yml | 4 |
3 files changed, 17 insertions, 1 deletions
diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index 2ee1d50a7..9e50a4a18 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -5,5 +5,5 @@ g_masters_group: "{{ 'masters' }}" g_nodes_group: "{{ 'nodes' }}" openshift_cluster_id: "{{ cluster_id | default('default') }}" - openshift_debug_level: 4 + openshift_debug_level: 2 openshift_deployment_type: "{{ deployment_type }}" 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 |