openstack/openstack-ansible-ops
Code Issues Proposed changes

Make OSA repo location configurable

Browse Source 
Adds a variable for specifying the OSA repo to check out.

Change-Id: I7f87c59f16cea0c4acbfb02d83a4ec3db9df2a45
This commit is contained in:
Antony Messerli
2018-06-07 17:25:50 -05:00
parent 025267213a
commit 02542eaaf8
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
multi-node-aio/README.rst
View File

@@ -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: Instruct the VM to use the selected kernel meta package, eg. linux-generic:
``DEFAULT_KERNEL=${DEFAULT_KERNEL:-linux-image-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: Set the OSA branch for this script to deploy:
``OSA_BRANCH=${OSA_BRANCH:-master}`` ``OSA_BRANCH=${OSA_BRANCH:-master}``

1
multi-node-aio/build.sh
View File

@@ -33,6 +33,7 @@ ansible-playbook -vv \
-e setup_dhcpd=${SETUP_DHCPD:-"true"} \ -e setup_dhcpd=${SETUP_DHCPD:-"true"} \
-e deploy_vms=${DEPLOY_VMS:-"true"} \ -e deploy_vms=${DEPLOY_VMS:-"true"} \
-e deploy_osa=${DEPLOY_OSA:-"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 osa_branch=${OSA_BRANCH:-"master"} \
-e default_network=${DEFAULT_NETWORK:-"eth0"} \ -e default_network=${DEFAULT_NETWORK:-"eth0"} \
-e default_image=${DEFAULT_IMAGE:-"ubuntu-16.04-amd64"} \ -e default_image=${DEFAULT_IMAGE:-"ubuntu-16.04-amd64"} \

2
multi-node-aio/playbooks/deploy-osa.yml
View File

@@ -32,7 +32,7 @@
# Example read-write git checkout from github # Example read-write git checkout from github
- name: Get OSA - name: Get OSA
git: git:
repo: https://git.openstack.org/openstack/openstack-ansible repo: "{{ osa_repo | default('https://git.openstack.org/openstack/openstack-ansible') }}"
dest: /opt/openstack-ansible dest: /opt/openstack-ansible
version: "{{ osa_branch | default('master') }}" version: "{{ osa_branch | default('master') }}"
force: true force: true