From 02542eaaf872797f3f615ba0156f84517f019620 Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Thu, 7 Jun 2018 17:25:50 -0500
Subject: [PATCH] Make OSA repo location configurable
Adds a variable for specifying the OSA repo to check out.
Change-Id: I7f87c59f16cea0c4acbfb02d83a4ec3db9df2a45
---
multi-node-aio/README.rst | 3 +++
multi-node-aio/build.sh | 1 +
multi-node-aio/playbooks/deploy-osa.yml | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/multi-node-aio/README.rst b/multi-node-aio/README.rst
index 2b401028..d6a5cece 100644
--- a/multi-node-aio/README.rst
+++ b/multi-node-aio/README.rst
@@ -125,6 +125,9 @@ Instruct the VM to use the selected image, eg. ubuntu-16.04-amd64:
Instruct the VM to use the selected kernel meta package, eg. linux-generic:
``DEFAULT_KERNEL=${DEFAULT_KERNEL:-linux-image-generic}``
+Set the OSA repo for this script to retrieve:
+ ``OSA_REPO=${OSA_REPO:-https://git.openstack.org/openstack/openstack-ansible}``
+
Set the OSA branch for this script to deploy:
``OSA_BRANCH=${OSA_BRANCH:-master}``
diff --git a/multi-node-aio/build.sh b/multi-node-aio/build.sh
index 4c1d4cc9..ee13430e 100755
--- a/multi-node-aio/build.sh
+++ b/multi-node-aio/build.sh
@@ -33,6 +33,7 @@ ansible-playbook -vv \
-e setup_dhcpd=${SETUP_DHCPD:-"true"} \
-e deploy_vms=${DEPLOY_VMS:-"true"} \
-e deploy_osa=${DEPLOY_OSA:-"true"} \
+ -e osa_repo=${OSA_REPO:-"https://git.openstack.org/openstack/openstack-ansible"} \
-e osa_branch=${OSA_BRANCH:-"master"} \
-e default_network=${DEFAULT_NETWORK:-"eth0"} \
-e default_image=${DEFAULT_IMAGE:-"ubuntu-16.04-amd64"} \
diff --git a/multi-node-aio/playbooks/deploy-osa.yml b/multi-node-aio/playbooks/deploy-osa.yml
index 154935a3..dd584661 100644
--- a/multi-node-aio/playbooks/deploy-osa.yml
+++ b/multi-node-aio/playbooks/deploy-osa.yml
@@ -32,7 +32,7 @@
# Example read-write git checkout from github
- name: Get OSA
git:
- repo: https://git.openstack.org/openstack/openstack-ansible
+ repo: "{{ osa_repo | default('https://git.openstack.org/openstack/openstack-ansible') }}"
dest: /opt/openstack-ansible
version: "{{ osa_branch | default('master') }}"
force: true