diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | inventory/byo/hosts.origin.example | 6 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 6 | ||||
| -rw-r--r-- | openshift-ansible.spec | 21 | ||||
| -rw-r--r-- | roles/openshift_hosted_logging/tasks/deploy_logging.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 4 | ||||
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 2 |
7 files changed, 34 insertions, 9 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index c913ecda8..da02d3f12 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.4.3-1 ./ +3.4.5-1 ./ diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 0513a70fd..706dd8080 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -552,7 +552,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Configure dnsIP in the node config #openshift_dns_ip=172.30.0.1 -# Configure node kubelet arguments +# Configure node kubelet arguments. pods-per-core is valid in OpenShift Origin 1.3 or OpenShift Container Platform 3.3 and later. #openshift_node_kubelet_args={'pods-per-core': ['10'], 'max-pods': ['250'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']} # Configure logrotate scripts @@ -625,8 +625,10 @@ ose3-master[1:3]-ansible.test.example.com [etcd] ose3-etcd[1:3]-ansible.test.example.com +# NOTE: Containerized load balancer hosts are not yet supported, if using a global +# containerized=true host variable we must set to false. [lb] -ose3-lb-ansible.test.example.com +ose3-lb-ansible.test.example.com containerized=false # NOTE: Currently we require that masters be part of the SDN which requires that they also be nodes # However, in order to ensure that your masters are not burdened with running pods you should diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 8515a4c55..09f1350b1 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -552,7 +552,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', # Configure dnsIP in the node config #openshift_dns_ip=172.30.0.1 -# Configure node kubelet arguments +# Configure node kubelet arguments. pods-per-core is valid in OpenShift Origin 1.3 or OpenShift Container Platform 3.3 and later. #openshift_node_kubelet_args={'pods-per-core': ['10'], 'max-pods': ['250'], 'image-gc-high-threshold': ['90'], 'image-gc-low-threshold': ['80']} # Configure logrotate scripts @@ -625,8 +625,10 @@ ose3-master[1:3]-ansible.test.example.com [etcd] ose3-etcd[1:3]-ansible.test.example.com +# NOTE: Containerized load balancer hosts are not yet supported, if using a global +# containerized=true host variable we must set to false. [lb] -ose3-lb-ansible.test.example.com +ose3-lb-ansible.test.example.com containerized=false # NOTE: Currently we require that masters be part of the SDN which requires that they also be nodes # However, in order to ensure that your masters are not burdened with running pods you should diff --git a/openshift-ansible.spec b/openshift-ansible.spec index a8f03d17d..f4e89f906 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -5,7 +5,7 @@ } Name: openshift-ansible -Version: 3.4.3 +Version: 3.4.5 Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 @@ -249,6 +249,25 @@ Atomic OpenShift Utilities includes %changelog +* Fri Oct 07 2016 Scott Dodson <sdodson@redhat.com> 3.4.5-1 +- [a-o-i] -v disables quiet ansible config. (abutcher@redhat.com) + +* Fri Oct 07 2016 Troy Dawson <tdawson@redhat.com> 3.4.4-1 +- note different product versions (jeder@redhat.com) +- Error out if containerized=true for lb host. (dgoodwin@redhat.com) +- Removes an unused file (jtslear@gmail.com) +- Update v1.3 content (sdodson@redhat.com) +- Add v1.4 content (sdodson@redhat.com) +- Set master facts for first master in node scaleup. (abutcher@redhat.com) +- Fix default port typo. (abutcher@redhat.com) +- Add example openid/request header providers and explain certificate + variables. (abutcher@redhat.com) +- Move openshift.common.debug.level to openshift_facts. (abutcher@redhat.com) +- Don't secure registry or deploy registry console when infra replics == 0 + (abutcher@redhat.com) +- the example line fails on releases prior to 3.3, so put a comment there. + (jeder@redhat.com) + * Tue Oct 04 2016 Scott Dodson <sdodson@redhat.com> 3.4.3-1 - Check if openshift_master_ingress_ip_network_cidr is defined (Mathias.Merscher@dg-i.net) diff --git a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml index f64c56248..65af1c08e 100644 --- a/roles/openshift_hosted_logging/tasks/deploy_logging.yaml +++ b/roles/openshift_hosted_logging/tasks/deploy_logging.yaml @@ -138,7 +138,7 @@ delay: 5 - name: "Deploy fluentd by labeling the node" - shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig label node --overwrite=true {{ '-l openshift_hosted_logging_fluentd_nodeselector' if openshift_hosted_logging_fluentd_nodeselector is defined else '--all' }} {{ openshift_hosted_logging_fluentd_nodeselector_label if openshift_hosted_logging_fluentd_nodeselector_label is defined else 'logging-infra-fluentd=true' }}" + shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig label node --overwrite=true {{ '-l' ~ openshift_hosted_logging_fluentd_nodeselector if openshift_hosted_logging_fluentd_nodeselector is defined else '--all' }} {{ openshift_hosted_logging_fluentd_nodeselector_label if openshift_hosted_logging_fluentd_nodeselector_label is defined else 'logging-infra-fluentd=true' }}" - name: "Wait for fluentd to be running" shell: "{{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig get pods -l component=fluentd | grep Running" diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml index bb4982e2d..b8e6a7da2 100644 --- a/roles/openshift_loadbalancer/tasks/main.yml +++ b/roles/openshift_loadbalancer/tasks/main.yml @@ -1,7 +1,9 @@ --- +- fail: msg="Cannot use containerized=true for load balancer hosts." + when: openshift.common.is_containerized | bool + - name: Install haproxy action: "{{ ansible_pkg_mgr }} name=haproxy state=present" - when: not openshift.common.is_containerized | bool - name: Configure systemd service directory for haproxy file: diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 347ae7ec9..8f4e6af30 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -876,7 +876,7 @@ def cli(ctx, unattended, configuration, ansible_playbook_directory, ansible_log_ # If we're installed by RPM this file should exist and we can use it as our default: oo_cfg.settings['ansible_config'] = DEFAULT_ANSIBLE_CONFIG - if os.path.exists(QUIET_ANSIBLE_CONFIG): + if not verbose and os.path.exists(QUIET_ANSIBLE_CONFIG): oo_cfg.settings['ansible_quiet_config'] = QUIET_ANSIBLE_CONFIG oo_cfg.settings['ansible_log_path'] = ctx.obj['ansible_log_path'] |