diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | inventory/byo/hosts.origin.example | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 13 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/aws.yml | 12 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 24 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 10 |
9 files changed, 67 insertions, 8 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index e68d5ee40..5cab6c846 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.4.13-1 ./ +3.4.15-1 ./ diff --git a/Dockerfile b/Dockerfile index 70f6f8a18..f3d45837a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,9 @@ LABEL Version="v3.1.1.901" LABEL Release="6" LABEL BZComponent="aos3-installation-docker" LABEL Architecture="x86_64" +LABEL io.k8s.description="Ansible code and playbooks for installing Openshift Container Platform." \ + io.k8s.display-name="Openshift Installer" \ + io.openshift.tags="openshift,installer" RUN INSTALL_PKGS="atomic-openshift-utils" && \ yum install -y --enablerepo=rhel-7-server-ose-3.2-rpms $INSTALL_PKGS && \ @@ -22,11 +22,16 @@ not practical to start over at 1.0. ##Setup - Install base dependencies: + - Requirements: + - Ansible >= 2.1.0 though 2.2 is preferred for performance reasons. + - Jinja >= 2.7 + - Fedora: ``` dnf install -y ansible-2.1.0.0 pyOpenSSL python-cryptography ``` - - OSX: + + - OSX: ``` # Install ansible 2.1.0.0 and python 2 brew install ansible python diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 04922894b..13f4c214c 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -30,7 +30,7 @@ deployment_type=origin # use this to lookup the latest exact version of the container images, which is the tag actually used to configure # the cluster. For RPM installations we just verify the version detected in your configured repos matches this # release. -openshift_release=v1.2 +openshift_release=v1.4 # Specify an exact container image tag to install or configure. # WARNING: This value will be used for all hosts in containerized environments, even those that have another version installed. diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index fd5c8a5f4..2d54dfceb 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -30,7 +30,7 @@ deployment_type=openshift-enterprise # use this to lookup the latest exact version of the container images, which is the tag actually used to configure # the cluster. For RPM installations we just verify the version detected in your configured repos matches this # release. -openshift_release=v3.2 +openshift_release=v3.4 # Specify an exact container image tag to install or configure. # WARNING: This value will be used for all hosts in containerized environments, even those that have another version installed. diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 81c11a44f..11ef1ae0d 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.4.13 +Version: 3.4.15 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -249,6 +249,17 @@ Atomic OpenShift Utilities includes %changelog +* Mon Oct 31 2016 Troy Dawson <tdawson@redhat.com> 3.4.15-1 +- Bump documented openshift_release for 1.4/3.4. (dgoodwin@redhat.com) +- Add requirements, fix a small formatting issue. + (erinn.looneytriggs@gmail.com) + +* Fri Oct 28 2016 Troy Dawson <tdawson@redhat.com> 3.4.14-1 +- Change HA master controller service to restart always. (dgoodwin@redhat.com) +- Default hosted_registry_insecure true when insecure registry present in + existing /etc/sysconfig/docker. (abutcher@redhat.com) +- Fix race condtion in openshift_facts (smunilla@redhat.com) + * Wed Oct 26 2016 Troy Dawson <tdawson@redhat.com> 3.4.13-1 - [upgrades] Fix containerized node (sdodson@redhat.com) - Add support for 3.4 upgrade. (dgoodwin@redhat.com) diff --git a/roles/openshift_cloud_provider/tasks/aws.yml b/roles/openshift_cloud_provider/tasks/aws.yml index bf2abcbf5..127a5b392 100644 --- a/roles/openshift_cloud_provider/tasks/aws.yml +++ b/roles/openshift_cloud_provider/tasks/aws.yml @@ -1,4 +1,14 @@ -- name: Create cloud config +# Work around ini_file create option in 2.2 which defaults to no +- name: Create cloud config file + file: + dest: "{{ openshift.common.config_base }}/cloudprovider/aws.conf" + state: touch + mode: 0660 + owner: root + group: root + changed_when: false + +- name: Configure AWS cloud provider ini_file: dest: "{{ openshift.common.config_base }}/cloudprovider/aws.conf" section: Global diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 0a783b164..6c045e7ab 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1206,7 +1206,7 @@ def get_openshift_version(facts): # version if 'common' in facts: if 'version' in facts['common'] and facts['common']['version'] is not None: - return facts['common']['version'] + return chomp_commit_offset(facts['common']['version']) if os.path.isfile('/usr/bin/openshift'): _, output, _ = module.run_command(['/usr/bin/openshift', 'version']) @@ -1221,7 +1221,27 @@ def get_openshift_version(facts): _, output, _ = module.run_command(['/usr/local/bin/openshift', 'version']) version = parse_openshift_version(output) - return version + return chomp_commit_offset(version) + + +def chomp_commit_offset(version): + """Chomp any "+git.foo" commit offset string from the given `version` + and return the modified version string. + +Ex: +- chomp_commit_offset(None) => None +- chomp_commit_offset(1337) => "1337" +- chomp_commit_offset("v3.4.0.15+git.derp") => "v3.4.0.15" +- chomp_commit_offset("v3.4.0.15") => "v3.4.0.15" +- chomp_commit_offset("v1.3.0+52492b4") => "v1.3.0" + """ + if version is None: + return version + else: + # Stringify, just in case it's a Number type. Split by '+' and + # return the first split. No concerns about strings without a + # '+', .split() returns an array of the original string. + return str(version).split('+')[0] def get_container_openshift_version(facts): diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml index b8e6a7da2..863738143 100644 --- a/roles/openshift_loadbalancer/tasks/main.yml +++ b/roles/openshift_loadbalancer/tasks/main.yml @@ -10,6 +10,16 @@ path: /etc/systemd/system/haproxy.service.d state: directory +# Work around ini_file create option in 2.2 which defaults to no +- name: Create limits.conf file + file: + dest: /etc/systemd/system/haproxy.service.d/limits.conf + state: touch + mode: 0660 + owner: root + group: root + changed_when: false + - name: Configure the nofile limits for haproxy ini_file: dest: /etc/systemd/system/haproxy.service.d/limits.conf |