summaryrefslogtreecommitdiffstats
path: root/roles/openshift_repos
diff options
context:
space:
mode:
authorLuke Meyer <lmeyer@redhat.com>2017-03-22 15:23:29 -0400
committerLuke Meyer <lmeyer@redhat.com>2017-03-29 11:59:47 -0400
commitf5827111a7609b3c6f7f72a03c8bc13fee2bbb60 (patch)
tree8b1cacfc6290c3a9d33c5a23c56e2715a4d2c399 /roles/openshift_repos
parentd77a9a685c3add9ef9c4d659ee47ebf35e145fe4 (diff)
downloadopenshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.gz
openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.bz2
openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.tar.xz
openshift-f5827111a7609b3c6f7f72a03c8bc13fee2bbb60.zip
validate and normalize inventory variables
In openshift_repos and everywhere, ensure deployment_type and openshift_deployment_type are defined and the same. We really want to set openshift_deployment_type, but users will likely still have just deployment_type, so accept both. And don't make every playbook default openshift_deployment_type to deployment_type. This introduces the openshift_sanitize_inventory role to run before anything else.
Diffstat (limited to 'roles/openshift_repos')
-rw-r--r--roles/openshift_repos/meta/main.yml3
-rw-r--r--roles/openshift_repos/tasks/main.yaml4
-rw-r--r--roles/openshift_repos/vars/main.yml7
3 files changed, 2 insertions, 12 deletions
diff --git a/roles/openshift_repos/meta/main.yml b/roles/openshift_repos/meta/main.yml
index cc18c453c..1b043863b 100644
--- a/roles/openshift_repos/meta/main.yml
+++ b/roles/openshift_repos/meta/main.yml
@@ -11,4 +11,5 @@ galaxy_info:
- 7
categories:
- cloud
-dependencies: []
+dependencies:
+- role: openshift_sanitize_inventory
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index ffb760bfe..84a0905cc 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -4,10 +4,6 @@
path: /run/ostree-booted
register: ostree_booted
-- assert:
- that: openshift_deployment_type in known_openshift_deployment_types
- msg: "openshift_deployment_type must be one of {{ known_openshift_deployment_types }}"
-
- block:
- name: Ensure libselinux-python is installed
package: name=libselinux-python state=present
diff --git a/roles/openshift_repos/vars/main.yml b/roles/openshift_repos/vars/main.yml
deleted file mode 100644
index da48e42c1..000000000
--- a/roles/openshift_repos/vars/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-# origin uses community packages named 'origin'
-# online currently uses 'openshift' packages
-# enterprise is used for OSE 3.0 < 3.1 which uses packages named 'openshift'
-# atomic-enterprise uses Red Hat packages named 'atomic-openshift'
-# openshift-enterprise uses Red Hat packages named 'atomic-openshift' starting with OSE 3.1
-known_openshift_deployment_types: ['origin', 'online', 'enterprise', 'atomic-enterprise', 'openshift-enterprise']