diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index c74d126f32..0816976274 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -133,7 +133,7 @@ openshift_release: "v1.3", openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_playbook: "playbooks/byo/config.yml", - openshift_ansible_refspec: "openshift-ansible-3.3.41-1", + openshift_ansible_version: "openshift-ansible-3.3.41-1", openshift_cluster_masters_group: "osbs-masters-stg", openshift_cluster_nodes_group: "osbs-nodes-stg", openshift_named_certificates: [{ diff --git a/roles/ansible-ansible-openshift-ansible/defaults/main.yml b/roles/ansible-ansible-openshift-ansible/defaults/main.yml index 193523e2cd..ab724b1db4 100644 --- a/roles/ansible-ansible-openshift-ansible/defaults/main.yml +++ b/roles/ansible-ansible-openshift-ansible/defaults/main.yml @@ -15,10 +15,10 @@ openshift_ansible_path: "/root/openshift-ansible" # remotely openshift_ansible_playbook: "playbooks/byo/config.yml" -# openshift-ansible refspec, this is the git tag of the "release" of the +# openshift-ansible version tag, this is the git tag of the "release" of the # openshift-ansible git repo. We need to track OpenShift v1.x to # openshift-ansible-3.x.y-1 as that's the release/tag standard upstream. -openshift_ansible_refspec: "openshift-ansible-3.2.35-1" +openshift_ansible_version: "openshift-ansible-3.2.35-1" # The group names assigned to these variables are used to create the "effective" # inventory (via a template) that is used to deploy the OpenShift Cluster via diff --git a/roles/ansible-ansible-openshift-ansible/tasks/main.yml b/roles/ansible-ansible-openshift-ansible/tasks/main.yml index 91e4920ff0..33637099d8 100644 --- a/roles/ansible-ansible-openshift-ansible/tasks/main.yml +++ b/roles/ansible-ansible-openshift-ansible/tasks/main.yml @@ -13,7 +13,7 @@ git: repo: "https://github.com/openshift/openshift-ansible.git" dest: "{{ openshift_ansible_path }}" - refspec: "{{ openshift_ansible_refspec }}" + version: "{{ openshift_ansible_version }}" - name: generate the inventory file template: