diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-04-07 09:32:46 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-04-07 09:32:46 -0700 |
| commit | 675f6165a83b86c1a498c327161f928d218ee244 (patch) | |
| tree | 0ad271a03feac6bde2a296e6011498cd6455fa99 /roles/openshift_repos | |
| parent | 59e69dd21c19bf745392b5e83bd652630ee870cc (diff) | |
| parent | 8a4888ad30ce7c5898caac47614da2e13a759320 (diff) | |
| download | openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.gz openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.bz2 openshift-675f6165a83b86c1a498c327161f928d218ee244.tar.xz openshift-675f6165a83b86c1a498c327161f928d218ee244.zip | |
Merge pull request #121 from detiber/nodeRegistrationChangesMaster
Node registration changes master
Diffstat (limited to 'roles/openshift_repos')
| -rw-r--r-- | roles/openshift_repos/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_repos/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 6 |
3 files changed, 10 insertions, 1 deletions
diff --git a/roles/openshift_repos/defaults/main.yaml b/roles/openshift_repos/defaults/main.yaml index 6fe2bf621..1730207f4 100644 --- a/roles/openshift_repos/defaults/main.yaml +++ b/roles/openshift_repos/defaults/main.yaml @@ -1,5 +1,7 @@ --- # TODO: once we are able to configure/deploy origin using the openshift roles, # then we should default to origin + +# TODO: push the defaulting of these values to the openshift_facts module openshift_deployment_type: online openshift_additional_repos: {} diff --git a/roles/openshift_repos/meta/main.yml b/roles/openshift_repos/meta/main.yml index cc18c453c..0558b822c 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_facts } diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml index 6219c4906..bb1551d37 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -1,6 +1,12 @@ --- # TODO: Add flag for enabling EPEL repo, default to false +# TODO: Add subscription-management config, with parameters +# for username, password, poolid(name), and official repos to +# enable/disable. Might need to make a module that extends the +# subscription management module to take a poolid and enable/disable the +# proper repos correctly. + - assert: that: openshift_deployment_type in known_openshift_deployment_types |