diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2015-03-23 23:53:17 -0400 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2015-04-03 14:51:26 -0400 |
| commit | 4712e72c912a1102bff0508c98bd97da3f33ae95 (patch) | |
| tree | 04a2bfebd3ac8b746150921bd134dbde70a9a56a /roles/openshift_repos | |
| parent | 59e69dd21c19bf745392b5e83bd652630ee870cc (diff) | |
| download | openshift-4712e72c912a1102bff0508c98bd97da3f33ae95.tar.gz openshift-4712e72c912a1102bff0508c98bd97da3f33ae95.tar.bz2 openshift-4712e72c912a1102bff0508c98bd97da3f33ae95.tar.xz openshift-4712e72c912a1102bff0508c98bd97da3f33ae95.zip | |
openshift_facts role/module refactor default settings
- Add openshift_facts role and module
- Created new role openshift_facts that contains an openshift_facts module
- Refactor openshift_* roles to use openshift_facts instead of relying on
defaults
- Refactor playbooks to use openshift_facts
- Cleanup inventory group_vars
- Update defaults
- update openshift_master role firewall defaults
- remove etcd peer port, since we will not be supporting clustered embedded
etcd
- remove 8444 since console now runs on the api port by default
- add 8444 and 7001 to disabled services to ensure removal if updating
- Add new role os_env_extras_node that is a subset of the docker role
- previously, we were starting/enabling docker which was causing issues with some
installations
- Does not install or start docker, since the openshift-node role will
handle that for us
- Only adds root to the dockerroot group
- Update playbooks to use ops_env_extras_node role instead of docker role
- os_firewall bug fixes
- ignore ip6tables for now, since we are not configuring any ipv6 rules
- if installing package do a daemon-reload before starting/enabling service
- Add aws support to bin/cluster
- Add list action to bin/cluster
- Add update action to bin/cluster
- cleanup some stray debug statements
- some variable renaming for clarity
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 |