From d975746c51ec75b0aa6d2f49d4922fd1de67181e Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Wed, 15 Oct 2014 08:36:54 +0000 Subject: Make mason.conf contain everything it needs to This adds TEST_INFRASTRUCTURE_TYPE and OPENSTACK_NETWORK_ID to mason.conf, as well as ending the confusion of using both MASON_TEST_HOST and TEST_VM_HOST_SSH_URL to mean the same thing in different places. --- mason/share/mason.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mason/share') diff --git a/mason/share/mason.conf b/mason/share/mason.conf index b323896d..abbf357a 100644 --- a/mason/share/mason.conf +++ b/mason/share/mason.conf @@ -9,4 +9,6 @@ DISTBUILD_ARCH={{ MASON_DISTBUILD_ARCH|quote }} DISTBUILD_CONTROLLER_ADDRESS={{ CONTROLLERHOST|quote }} TROVE_ID={{ TROVE_ID|quote }} BUILD_CLUSTER_MORPHOLOGY={{ MASON_CLUSTER_MORPHOLOGY|quote }} -TEST_VM_HOST_SSH_URL={{ MASON_TEST_HOST|quote }} +MASON_TEST_HOST={{ MASON_TEST_HOST|quote }} +TEST_INFRASTRUCTURE_TYPE={{ TEST_INFRASTRUCTURE_TYPE|quote }} +OPENSTACK_NETWORK_ID={{ OPENSTACK_NETWORK_ID|quote }} -- cgit v1.2.1 From ee5a2bda0f645315376833c2ad91d7c3314c8c0b Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Mon, 20 Oct 2014 08:07:27 +0000 Subject: Use Ansible to generate config for OpenStack --- mason/share/os.conf | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 mason/share/os.conf (limited to 'mason/share') diff --git a/mason/share/os.conf b/mason/share/os.conf new file mode 100644 index 00000000..21ef398c --- /dev/null +++ b/mason/share/os.conf @@ -0,0 +1,30 @@ +#!/bin/bash + +# A version of this file with the relevant information included can be +# obtained by navigating to 'Access & Security' -> 'API Access' -> +# 'Download OpenStack RC file' in The Horizon web interface of your +# OpenStack. However, the file obtained from there sets OS_PASSWORD +# such that it will ask the user for a password, so you will need to +# change that for Mason to work automatically. +# +# With the addition of Keystone, to use an openstack cloud you should +# authenticate against keystone, which returns a **Token** and **Service +# Catalog**. The catalog contains the endpoint for all services the +# user/tenant has access to - including nova, glance, keystone, swift. +# +# *NOTE*: Using the 2.0 *auth api* does not mean that compute api is 2.0. We +# will use the 1.1 *compute api* +export OS_AUTH_URL={{ OS_AUTH_URL|quote }} + +# With the addition of Keystone we have standardized on the term **tenant** +# as the entity that owns the resources. +export OS_TENANT_ID={{ OS_TENANT_ID|quote }} +export OS_TENANT_NAME={{ OS_TENANT_NAME|quote }} + +# In addition to the owning entity (tenant), openstack stores the entity +# performing the action as the **user**. +export OS_USERNAME={{ OS_USERNAME|quote }} + +# With Keystone you pass the keystone password. +export OS_PASSWORD={{ OS_PASSWORD|quote }} + -- cgit v1.2.1