try and update openshift in stg only to 3.10...

files/openshift/openshift.repo

@@ -5,11 +5,17 @@ baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
 enabled=1
 {% elif inventory_hostname.startswith('os') %}
+[rhel7-openshift-3.10]
+name = rhel7 openshift 3.10 $basearch
+baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.10-rpms/
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled=1
+
 [rhel7-openshift-3.9]
 name = rhel7 openshift 3.9 $basearch
 baseurl=http://infrastructure.fedoraproject.org/repo/rhel/rhel7/$basearch/rhel-7-openshift-3.9-rpms/
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled=1
+enabled=0
 
 # 3.8 is needed to upgrade from 3.7 to 3.9
 [rhel7-openshift-3.8]

playbooks/groups/os-cluster.yml

@@ -103,11 +103,11 @@
     - {
       role: ansible-ansible-openshift-ansible,
         cluster_inventory_filename: "cluster-inventory-stg",
-        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.33-1",
         openshift_ansible_ssh_user: root,
         openshift_ansible_install_examples: false,
         openshift_ansible_containerized_deploy: false,

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

@@ -21,6 +21,15 @@
   - ansible-ansible-openshift-ansible
   - ansible-ansible-openshift-ansible-config
 
+- name: generate the inventory file
+  template:
+    src: "cluster-inventory-stg.j2"
+    dest: "{{ openshift_ansible_path }}/{{ cluster_inventory_filename }}"
+  tags:
+  - ansible-ansible-openshift-ansible
+  - ansible-ansible-openshift-ansible-config
+  when: env == 'staging' and inventory_hostname.startswith('os-')
+
 - name: generate the inventory file
   template:
     src: "cluster-inventory.j2"
@@ -28,6 +37,7 @@
   tags:
   - ansible-ansible-openshift-ansible
   - ansible-ansible-openshift-ansible-config
+  when: env == 'production' or inventory_hostname.startswith('osbs-')
 
 - name: run ansible prereqs playbook
   shell: "ansible-playbook {{ openshift_ansible_pre_playbook }} -i {{ cluster_inventory_filename }}"