diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:10:48 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-10-27 09:10:48 +0000 |
commit | 19d3ce76b9f785ee34457482415dee9bc4aaf9d2 (patch) | |
tree | e2525d92184b752d7bdd9e87a862b11a848b850f /mason.configure | |
parent | 6b9c0c1ba8b23741349c535adf426a9e8a41d3c1 (diff) | |
parent | b3a7c84e3dfb3385b7c5f5cc104ab2f6be278b91 (diff) | |
download | definitions-19d3ce76b9f785ee34457482415dee9bc4aaf9d2.tar.gz |
Merge branch 'baserock/adamcoldrick/mason-openstack-rebased'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'mason.configure')
-rw-r--r-- | mason.configure | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/mason.configure b/mason.configure index 4d11feb4..d0abbf11 100644 --- a/mason.configure +++ b/mason.configure @@ -24,6 +24,8 @@ # * MASON_DEFINITIONS_REF # * MASON_DISTBUILD_ARCH # * MASON_TEST_HOST +# * OPENSTACK_NETWORK_ID +# * TEST_INFRASTRUCTURE_TYPE # * TROVE_HOST # * TROVE_ID # * CONTROLLERHOST @@ -41,6 +43,7 @@ ROOT="$1" mkdir -p "$ROOT"/usr/lib/mason cp mason/mason.sh "$ROOT"/usr/lib/mason/mason.sh cp mason/mason-report.sh "$ROOT"/usr/lib/mason/mason-report.sh +cp mason/os-init-script "$ROOT"/usr/lib/mason/os-init-script cp mason/mason.timer "$ROOT"/etc/systemd/system/mason.timer @@ -108,6 +111,8 @@ mason_configuration={ 'MASON_DEFINITIONS_REF': os.environ['MASON_DEFINITIONS_REF'], 'MASON_DISTBUILD_ARCH': os.environ['MASON_DISTBUILD_ARCH'], 'MASON_TEST_HOST': os.environ['MASON_TEST_HOST'], + 'OPENSTACK_NETWORK_ID': os.environ['OPENSTACK_NETWORK_ID'], + 'TEST_INFRASTRUCTURE_TYPE': os.environ['TEST_INFRASTRUCTURE_TYPE'], 'TROVE_ID': os.environ['TROVE_ID'], 'TROVE_HOST': os.environ['TROVE_HOST'], 'CONTROLLERHOST': os.environ['CONTROLLERHOST'], @@ -116,11 +121,25 @@ mason_configuration={ yaml.dump(mason_configuration, sys.stdout, default_flow_style=False) EOF +if [ "$TEST_INFRASTRUCTURE_TYPE" = "openstack" ]; then + python <<'EOF' >"$MASON_DATA/os.conf" +import os, sys, yaml + +openstack_credentials={ + 'OS_USERNAME': os.environ['OPENSTACK_USER'], + 'OS_TENANT_NAME': os.environ['OPENSTACK_TENANT'], + 'OS_TENANT_ID': os.environ['OPENSTACK_TENANT_ID'], + 'OS_AUTH_URL': os.environ['OPENSTACK_AUTH_URL'], + 'OS_PASSWORD': os.environ['OPENSTACK_PASSWORD'], +} + +yaml.dump(openstack_credentials, sys.stdout, default_flow_style=False) +EOF +fi ########################################################################## # Enable services ########################################################################## ln -s ../mason.timer "$ROOT"/etc/systemd/system/multi-user.target.wants/mason.timer -ln -s ../mason.service "$ROOT"/etc/systemd/system/multi-user.target.wants/mason.service ln -s ../httpd.service "$ROOT"/etc/systemd/system/multi-user.target.wants/httpd.service |