6 files changed, 40 insertions, 52 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 8ef9518a1..f94021e4e 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.7.0-0.120.0 ./
+3.7.0-0.121.0 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 03be832d6..827365633 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -10,7 +10,7 @@
 
 Name:           openshift-ansible
 Version:        3.7.0
-Release:        0.120.0%{?dist}
+Release:        0.121.0%{?dist}
 Summary:        Openshift and Atomic Enterprise Ansible
 License:        ASL 2.0
 URL:            https://github.com/openshift/openshift-ansible
@@ -280,6 +280,20 @@ Atomic OpenShift Utilities includes
 
 
 %changelog
+* Wed Aug 30 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.121.0
+- Revert "logging set memory request to limit" (sdodson@redhat.com)
+- Move firewall install and fix scaleup playbooks (rteague@redhat.com)
+- Fix group conditional requirements (rteague@redhat.com)
+- Updating openshift_service_catalog to use oc_service over oc_obj to resolve
+  idempotency issues being seen from rerunning role (ewolinet@redhat.com)
+- annotate the infra projects for logging to fix bz1480988
+  (jcantril@redhat.com)
+- docker_image_availability: timeout skopeo inspect (lmeyer@redhat.com)
+- Fix scaleup on containerized installations (sdodson@redhat.com)
+- bug 1480878. Default pvc for logging (jcantril@redhat.com)
+- logging set memory request to limit (jcantril@redhat.com)
+- openshift_cfme: add nfs directory support (fsimonce@redhat.com)
+
 * Tue Aug 29 2017 Jenkins CD Merge Bot <smunilla@redhat.com> 3.7.0-0.120.0
 - Nuage changes to add custom mounts for atomic-openshift-node service
   (rohan.s.parulekar@nuagenetworks.net)
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index c56b07037..61636a880 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -13,12 +13,12 @@
   - name: Evaluate groups - g_master_hosts or g_new_master_hosts required
     fail:
       msg: This playbook requires g_master_hosts or g_new_master_hosts to be set
-    when: g_master_hosts is not defined or g_new_master_hosts is not defined
+    when: g_master_hosts is not defined and g_new_master_hosts is not defined
 
   - name: Evaluate groups - g_node_hosts or g_new_node_hosts required
     fail:
       msg: This playbook requires g_node_hosts or g_new_node_hosts to be set
-    when: g_node_hosts is not defined or g_new_node_hosts is not defined
+    when: g_node_hosts is not defined and g_new_node_hosts is not defined
 
   - name: Evaluate groups - g_lb_hosts required
     fail:
diff --git a/roles/openshift_service_catalog/tasks/install.yml b/roles/openshift_service_catalog/tasks/install.yml
index 686857d94..64f94347b 100644
--- a/roles/openshift_service_catalog/tasks/install.yml
+++ b/roles/openshift_service_catalog/tasks/install.yml
@@ -168,19 +168,19 @@
       - "{{ mktemp.stdout }}/service_catalog_api_server.yml"
     delete_after: yes
 
-- template:
-    src: api_server_service.j2
-    dest: "{{ mktemp.stdout }}/service_catalog_api_service.yml"
-
 - name: Set Service Catalog API Server service
-  oc_obj:
-    state: present
-    namespace: "kube-service-catalog"
-    kind: service
+  oc_service:
     name: apiserver
-    files:
-      - "{{ mktemp.stdout }}/service_catalog_api_service.yml"
-    delete_after: yes
+    namespace: kube-service-catalog
+    state: present
+    ports:
+      - name: secure
+        port: 443
+        protocol: TCP
+        targetPort: 6443
+    selector:
+      app: apiserver
+    session_affinity: None
 
 - template:
     src: api_server_route.j2
@@ -216,19 +216,19 @@
       - "{{ mktemp.stdout }}/controller_manager.yml"
     delete_after: yes
 
-- template:
-    src: controller_manager_service.j2
-    dest: "{{ mktemp.stdout }}/controller_manager_service.yml"
-
 - name: Set Controller Manager service
-  oc_obj:
-    state: present
-    namespace: "kube-service-catalog"
-    kind: service
+  oc_service:
     name: controller-manager
-    files:
-      - "{{ mktemp.stdout }}/controller_manager_service.yml"
-    delete_after: yes
+    namespace: kube-service-catalog
+    state: present
+    ports:
+      - port: 6443
+        protocol: TCP
+        targetPort: 6443
+    selector:
+      app: controller-manager
+    session_affinity: None
+    service_type: ClusterIP
 
 - include: start_api_server.yml
 
diff --git a/roles/openshift_service_catalog/templates/api_server_service.j2 b/roles/openshift_service_catalog/templates/api_server_service.j2
deleted file mode 100644
index bae337201..000000000
--- a/roles/openshift_service_catalog/templates/api_server_service.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: apiserver
-spec:
-  ports:
-  - name: secure
-    port: 443
-    protocol: TCP
-    targetPort: 6443
-  selector:
-    app: apiserver
-  sessionAffinity: None
diff --git a/roles/openshift_service_catalog/templates/controller_manager_service.j2 b/roles/openshift_service_catalog/templates/controller_manager_service.j2
deleted file mode 100644
index 2bac645fc..000000000
--- a/roles/openshift_service_catalog/templates/controller_manager_service.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: controller-manager
-spec:
-  ports:
-  - port: 6443
-    protocol: TCP
-    targetPort: 6443
-  selector:
-    app: controller-manager
-  sessionAffinity: None
-  type: ClusterIP