diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 13 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/create_persistent_volumes.yml | 9 | ||||
| -rw-r--r-- | roles/ansible_service_broker/tasks/generate_certs.yml | 15 | ||||
| -rw-r--r-- | roles/openshift_logging/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml | 2 |
6 files changed, 27 insertions, 16 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index d293bf9e3..11035489b 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.7.0-0.198.0 ./ +3.7.2-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 7a15e80a8..2021d06af 100644 --- a/openshift-ansible.spec +++ b/openshift-ansible.spec @@ -9,8 +9,8 @@ %global __requires_exclude ^/usr/bin/ansible-playbook$ Name: openshift-ansible -Version: 3.7.0 -Release: 0.198.0%{?dist} +Version: 3.7.2 +Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 URL: https://github.com/openshift/openshift-ansible @@ -285,6 +285,15 @@ Atomic OpenShift Utilities includes %changelog +* Wed Nov 08 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.2-1 +- Remove debug code that was mistakenly committed (zgalor@redhat.com) +- Correct service restart command (sdodson@redhat.com) +- Give service-catalog controller-manager permissions to update status of + ClusterServiceClasses and ClusterServicePlans (staebler@redhat.com) + +* Wed Nov 08 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.1-1 +- Bug 1510636- add name to local registry config (fabian@fabianism.us) + * Wed Nov 08 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.198.0 - container_binary_sync: Remove atomic prefix from image (smilner@redhat.com) - Bug 1510546- Fix previous fix, task was indented one level too deep diff --git a/playbooks/common/openshift-cluster/create_persistent_volumes.yml b/playbooks/common/openshift-cluster/create_persistent_volumes.yml index ec6f2c52c..8a60a30b8 100644 --- a/playbooks/common/openshift-cluster/create_persistent_volumes.yml +++ b/playbooks/common/openshift-cluster/create_persistent_volumes.yml @@ -1,13 +1,4 @@ --- -- name: Create persistent volumes - hosts: oo_first_master - vars: - persistent_volumes: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volumes(groups) }}" - persistent_volume_claims: "{{ hostvars[groups.oo_first_master.0] | oo_persistent_volume_claims }}" - tasks: - - debug: var=persistent_volumes - - debug: var=persistent_volume_claims - - name: Create Hosted Resources - persistent volumes hosts: oo_first_master vars: diff --git a/roles/ansible_service_broker/tasks/generate_certs.yml b/roles/ansible_service_broker/tasks/generate_certs.yml index 85e67e00c..3da896548 100644 --- a/roles/ansible_service_broker/tasks/generate_certs.yml +++ b/roles/ansible_service_broker/tasks/generate_certs.yml @@ -29,7 +29,16 @@ - set_fact: ansible_service_broker_certs_dir: "{{ openshift.common.config_base }}/ansible-service-broker" +- name: Read in certs for etcd + slurp: + src: '{{ ansible_service_broker_certs_dir }}/{{ item }}' + register: asb_etcd_certs + with_items: + - cert.pem + - client.pem + - client.key + - set_fact: - etcd_ca_cert: "{{ lookup('file', '{{ ansible_service_broker_certs_dir }}/cert.pem') }}" - etcd_client_cert: "{{ lookup('file', '{{ ansible_service_broker_certs_dir }}/client.pem') }}" - etcd_client_key: "{{ lookup('file', '{{ ansible_service_broker_certs_dir }}/client.key') }}" + etcd_ca_cert: "{{ asb_etcd_certs.results.0.content | b64decode }}" + etcd_client_cert: "{{ asb_etcd_certs.results.1.content | b64decode }}" + etcd_client_key: "{{ asb_etcd_certs.results.2.content | b64decode }}" diff --git a/roles/openshift_logging/handlers/main.yml b/roles/openshift_logging/handlers/main.yml index acc838bd1..88b893448 100644 --- a/roles/openshift_logging/handlers/main.yml +++ b/roles/openshift_logging/handlers/main.yml @@ -6,7 +6,7 @@ # We retry the controllers because the API may not be 100% initialized yet. - name: restart master controllers - command: "{{ openshift.common.service_type }}-master-controllers" + command: "systemctl restart {{ openshift.common.service_type }}-master-controllers" retries: 3 delay: 5 register: result diff --git a/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml b/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml index f449fba2b..a0b41a4eb 100644 --- a/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml +++ b/roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml @@ -118,6 +118,8 @@ objects: - servicecatalog.k8s.io resources: - clusterservicebrokers/status + - clusterserviceclasses/status + - clusterserviceplans/status - serviceinstances/status - servicebindings/status - servicebindings/finalizers |