diff options
| -rw-r--r-- | README.md | 18 | ||||
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 3 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 1 | ||||
| -rw-r--r-- | roles/openshift_manageiq/vars/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 4 |
5 files changed, 19 insertions, 8 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/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index cd569937c..aaff789d7 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -181,6 +181,7 @@ - /etc/systemd/system/openvswitch.service - /etc/systemd/system/origin-node-dep.service - /etc/systemd/system/origin-node.service + - /etc/systemd/system/origin-node.service.wants - /run/openshift-sdn - /var/lib/atomic-enterprise - /var/lib/openshift @@ -346,7 +347,7 @@ - /etc/etcd - /etc/systemd/system/etcd_container.service - # Intenationally using rm command over file module because if someone had mounted a filesystem + # Intenationally using rm command over file module because if someone had mounted a filesystem # at /var/lib/etcd then the contents was not removed correctly - name: Remove etcd data shell: rm -rf /var/lib/etcd/* diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index e5cb0db15..bdc7d3947 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1731,6 +1731,7 @@ class OpenShiftFacts(object): {"name": "NoDiskConflict"}, {"name": "NoVolumeZoneConflict"}, {"name": "MaxEBSVolumeCount"}, + {"name": "MaxGCEPDVolumeCount"}, {"name": "Region", "argument": {"serviceAffinity" : {"labels" : ["region"]}}} ] scheduler_priorities = [ 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/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index f49e97745..995169dd6 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -34,6 +34,10 @@ action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }},tuned-profiles-{{ openshift.common.service_type }}-node{{ openshift_pkg_version | default('') | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" when: not openshift.common.is_containerized | bool +- name: Set atomic-guest tuned profile + command: "tuned-adm profile atomic-guest" + when: openshift.common.is_atomic | bool + - name: Install sdn-ovs package action: "{{ ansible_pkg_mgr }} name={{ openshift.common.service_type }}-sdn-ovs{{ openshift_pkg_version | oo_image_tag_to_rpm_version(include_dash=True) }} state=present" when: openshift.common.use_openshift_sdn and not openshift.common.is_containerized | bool |