Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

use git module version (not refspec) in ansible-ansible-openshift-ansible

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2016-11-01 13:34:59 +00:00
parent fbeb42e3ca
commit 5078474ca2
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
playbooks/groups/osbs-cluster.yml
View file

@ -133,7 +133,7 @@
openshift_release: "v1.3", openshift_release: "v1.3",
openshift_ansible_path: "/root/openshift-ansible", openshift_ansible_path: "/root/openshift-ansible",
openshift_ansible_playbook: "playbooks/byo/config.yml", 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_masters_group: "osbs-masters-stg",
openshift_cluster_nodes_group: "osbs-nodes-stg", openshift_cluster_nodes_group: "osbs-nodes-stg",
openshift_named_certificates: [{ openshift_named_certificates: [{

4
roles/ansible-ansible-openshift-ansible/defaults/main.yml
View file

@ -15,10 +15,10 @@ openshift_ansible_path: "/root/openshift-ansible"
# remotely # remotely
openshift_ansible_playbook: "playbooks/byo/config.yml" 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 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-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" # 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 # inventory (via a template) that is used to deploy the OpenShift Cluster via

2
roles/ansible-ansible-openshift-ansible/tasks/main.yml
View file

@ -13,7 +13,7 @@
git: git:
repo: "https://github.com/openshift/openshift-ansible.git" repo: "https://github.com/openshift/openshift-ansible.git"
dest: "{{ openshift_ansible_path }}" dest: "{{ openshift_ansible_path }}"
refspec: "{{ openshift_ansible_refspec }}" version: "{{ openshift_ansible_version }}"
- name: generate the inventory file - name: generate the inventory file
template: template: