diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-05-20 12:36:58 +0100 |
| commit | 3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7 (patch) | |
| tree | 4875e396af3ef083ee6883775e34c48e52605e2d /mason/share/os.conf | |
| parent | c368f61b0b460f120634219a5b70186c803d5bed (diff) | |
| parent | 4b9268eb9cb1f8d140f543d9c4a3aa1aa8298994 (diff) | |
| download | infrastructure-3972dc3a720794f2ded9fe5e6305d3fae4a6a7d7.tar.gz | |
Merge remote-tracking branch 'baserock/baserock/adamcoldrick/mason-2015' into sam/mason-zuul-2
Conflicts:
baserock_irclogs/systems/irclogs-x86_64.morph
hosts
scripts/licensecheck.pl
Change-Id: Ib298ce7928a8f5a23918b1226746c39e48fe705f
Diffstat (limited to 'mason/share/os.conf')
| -rw-r--r-- | mason/share/os.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mason/share/os.conf b/mason/share/os.conf index 21ef398c..1acfff79 100644 --- a/mason/share/os.conf +++ b/mason/share/os.conf @@ -18,7 +18,6 @@ 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 |