diff options
| author | Pep Turró Mauri <pep@redhat.com> | 2015-08-03 16:40:06 +0200 |
|---|---|---|
| committer | Pep Turró Mauri <pep@redhat.com> | 2015-08-03 17:48:15 +0200 |
| commit | e438f0c19e86241e11853970aa7e94e90c5fffeb (patch) | |
| tree | b5562060802f39c352428f9a283d7bc3a28a493d | |
| parent | 3548472edd08d09fafcb236790a44bcf31aa5f03 (diff) | |
| download | openshift-e438f0c19e86241e11853970aa7e94e90c5fffeb.tar.gz openshift-e438f0c19e86241e11853970aa7e94e90c5fffeb.tar.bz2 openshift-e438f0c19e86241e11853970aa7e94e90c5fffeb.tar.xz openshift-e438f0c19e86241e11853970aa7e94e90c5fffeb.zip | |
Use deployment_type, not openshift_deployment_type
This seems to be what's used in other places
| -rw-r--r-- | Vagrantfile | 2 | ||||
| -rw-r--r-- | playbooks/byo/rhel_subscribe.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Vagrantfile b/Vagrantfile index 20cf0b5bd..4675b5d60 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -83,7 +83,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| "nodes" => ["master", "node1", "node2"], } ansible.extra_vars = { - openshift_deployment_type: deployment_type, + deployment_type: deployment_type, } ansible.playbook = "playbooks/byo/vagrant.yml" end diff --git a/playbooks/byo/rhel_subscribe.yml b/playbooks/byo/rhel_subscribe.yml index 60300c3dc..f564905ea 100644 --- a/playbooks/byo/rhel_subscribe.yml +++ b/playbooks/byo/rhel_subscribe.yml @@ -1,10 +1,10 @@ --- - hosts: all vars: - deployment_type: "{{ openshift_deployment_type }}" + openshift_deployment_type: "{{ deployment_type }}" roles: - role: rhel_subscribe - when: openshift_deployment_type == "enterprise" and + 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'] |