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 e27949e85f3446baa1c895eee212b6d485b67215..6e0fd427fa0eb9f3627bde18e612578522cd42b8 100644 (file)
--- 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 40713d261dddde7e7469c5cde456c9ec2c4dc6a5..c8c5ab4ae341486cbed9bd8ae3bf646cb8280705 100644 (file)
--- 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