From: Daniel Farrell <dfarrell@redhat.com>
Date: Wed, 9 Aug 2017 08:13:28 +0000 (-0400)
Subject: Use ODL-managed ansible-odl repo in Packer builds
X-Git-Tag: release/nitrogen~41
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4c12eab7cc5c4c03bae996a23468faa82baad3a7;p=integration%2Fpackaging.git

Use ODL-managed ansible-odl repo in Packer builds

Explicitly telling ansible-galaxy that the SCM for Gerrit is git works
around the problem described in #61159 and the upstream issue.

https://github.com/ansible/galaxy-issues/issues/277

Change-Id: I08eb57a579d06cbad589ef721cb82ec41c31415e
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
---

diff --git a/packer/provision/config_ansible_centos.sh b/packer/provision/config_ansible_centos.sh
index e27949e..6e0fd42 100644
--- a/packer/provision/config_ansible_centos.sh
+++ b/packer/provision/config_ansible_centos.sh
@@ -34,7 +34,7 @@ sudo yum install -y ansible git
 ansible_version="origin/master"
 cat > /tmp/requirements.yml << EOM
 - name: opendaylight
-  src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight.git
+  src: git+https://git.opendaylight.org/gerrit/p/integration/packaging/ansible-opendaylight.git
   version: $ansible_version
 EOM
 sudo ansible-galaxy install -r /tmp/requirements.yml
diff --git a/packer/provision/config_ansible_fedora.sh b/packer/provision/config_ansible_fedora.sh
index 40713d2..c8c5ab4 100644
--- a/packer/provision/config_ansible_fedora.sh
+++ b/packer/provision/config_ansible_fedora.sh
@@ -30,7 +30,7 @@ sudo dnf install -y ansible git python-dnf
 ansible_version="origin/master"
 cat > /tmp/requirements.yml << EOM
 - name: opendaylight
-  src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight.git
+  src: git+https://git.opendaylight.org/gerrit/p/integration/packaging/ansible-opendaylight.git
   version: $ansible_version
 EOM
 sudo ansible-galaxy install -r /tmp/requirements.yml