diff options
| -rw-r--r-- | .tito/packages/openshift-ansible | 2 | ||||
| -rw-r--r-- | openshift-ansible.spec | 7 | ||||
| -rw-r--r-- | roles/openshift_logging/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_service_catalog/files/kubeservicecatalog_roles_bindings.yml | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible index d293bf9e3..a667c3f2d 100644 --- a/.tito/packages/openshift-ansible +++ b/.tito/packages/openshift-ansible @@ -1 +1 @@ -3.7.0-0.198.0 ./ +3.7.1-1 ./ diff --git a/openshift-ansible.spec b/openshift-ansible.spec index 7a15e80a8..aff376910 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.1 +Release: 1%{?dist} Summary: Openshift and Atomic Enterprise Ansible License: ASL 2.0 URL: https://github.com/openshift/openshift-ansible @@ -285,6 +285,9 @@ Atomic OpenShift Utilities includes %changelog +* 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/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 |