Lets try and upgrade prod to 3.10 as well. Hopefully leaving osbs alone.

playbooks/groups/os-cluster.yml

@@ -107,7 +107,7 @@
         openshift_ansible_path: "/root/openshift-ansible",
         openshift_ansible_pre_playbook: "playbooks/prerequisites.yml",
         openshift_ansible_playbook: "playbooks/deploy_cluster.yml",
-        openshift_ansible_version: "openshift-ansible-3.10.33-1",
+        openshift_ansible_version: "openshift-ansible-3.10.35-1",
         openshift_ansible_ssh_user: root,
         openshift_ansible_install_examples: false,
         openshift_ansible_containerized_deploy: false,
@@ -132,11 +132,11 @@
     - {
       role: ansible-ansible-openshift-ansible,
         cluster_inventory_filename: "cluster-inventory",
-        openshift_release: "v3.9",
+        openshift_release: "v3.10",
         openshift_ansible_path: "/root/openshift-ansible",
         openshift_ansible_pre_playbook: "playbooks/prerequisites.yml",
         openshift_ansible_playbook: "playbooks/deploy_cluster.yml",
-        openshift_ansible_version: "openshift-ansible-3.9.30-1",
+        openshift_ansible_version: "openshift-ansible-3.10.35-1",
         openshift_ansible_ssh_user: root,
         openshift_ansible_install_examples: false,
         openshift_ansible_containerized_deploy: false,

roles/ansible-ansible-openshift-ansible/tasks/main.yml

@@ -30,7 +30,7 @@
 - debug:
     var: openshift_master_default_subdomain
 
-- name: generate the inventory file
+- name: generate the inventory file (staging)
   template:
     src: "cluster-inventory-stg.j2"
     dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}"
@@ -39,14 +39,23 @@
   - ansible-ansible-openshift-ansible-config
   when: env == 'staging' and inventory_hostname.startswith('os-')
 
-- name: generate the inventory file
+- name: generate the inventory file (production)
+  template:
+    src: "cluster-inventory-prod.j2"
+    dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}"
+  tags:
+  - ansible-ansible-openshift-ansible
+  - ansible-ansible-openshift-ansible-config
+  when: env == 'production' and inventory_hostname.startswith('os-')
+
+- name: generate the inventory file (osbs)
   template:
     src: "cluster-inventory.j2"
     dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}"
   tags:
   - ansible-ansible-openshift-ansible
   - ansible-ansible-openshift-ansible-config
-  when: env == 'production' or inventory_hostname.startswith('osbs-')
+  when: inventory_hostname.startswith('osbs-')
 
 - name: run ansible prereqs playbook
   shell: "ansible-playbook {{ openshift_ansible_pre_playbook }} -i {{ cluster_inventory_filename }}"