diff options
| -rw-r--r-- | README.md | 18 | ||||
| -rw-r--r-- | roles/openshift_manageiq/vars/main.yml | 1 | ||||
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 3 |
3 files changed, 13 insertions, 9 deletions
@@ -7,14 +7,18 @@ that it installs currently require a package that provides `docker`. Currently the RPMs provided from dockerproject.org do not provide this requirement, though they may in the future. -##Branches +##Branches and tags + The master branch tracks our current work and should be compatible with both -Origin master branch and the current Origin stable release, currently that's -v1.3 and v1.2. Enterprise branches exist where we coordinate with internal Red -Hat Quality Assurance teams. Fixes and backwards compatible feature improvements -are often backported to the more current enterprise branches. The enterprise -branches should also be compatible with the corresponding Origin release for -users who are looking for more conservative rate of change. +Origin master branch and the most recent Origin stable release. Currently that's +v1.4 and v1.3.x. In addition to the master branch we maintain stable branches +corresponding to upstream Origin releases, ie: release-1.2. The most recent of +branch will often receive minor feature backports and fixes. Older branches will +receive only critical fixes. + +Releases are tagged periodically from active branches and are versioned 3.x +corresponding to Origin releases 1.x. We unfortunately started with 3.0 and it's +not practical to start over at 1.0. ##Setup - Install base dependencies: diff --git a/roles/openshift_manageiq/vars/main.yml b/roles/openshift_manageiq/vars/main.yml index b2aed79c7..6a0c5b41b 100644 --- a/roles/openshift_manageiq/vars/main.yml +++ b/roles/openshift_manageiq/vars/main.yml @@ -30,6 +30,7 @@ manage_iq_tasks: - policy add-scc-to-user privileged system:serviceaccount:management-infra:management-admin - policy add-cluster-role-to-user system:image-puller system:serviceaccount:management-infra:inspector-admin - policy add-scc-to-user privileged system:serviceaccount:management-infra:inspector-admin + - policy add-cluster-role-to-user self-provisioner system:serviceaccount:management-infra:management-admin manage_iq_openshift_3_2_tasks: - policy add-cluster-role-to-user system:image-auditor system:serviceaccount:management-infra:management-admin diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 2ec2b4137..85b4d29cb 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -483,8 +483,7 @@ def get_variant_and_version(multi_master=False): i = 1 combos = get_variant_version_combos() for (variant, version) in combos: - message = "%s\n(%s) %s %s" % (message, i, variant.description, - version.name) + message = "%s\n(%s) %s" % (message, i, variant.description) i = i + 1 message = "%s\n" % message |