summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-02-19 16:26:23 +0100
committervarac <varacanero@zeromail.org>2014-02-19 16:26:23 +0100
commitd9ead9053e60aaf2fb95a197fd1435dd06d18295 (patch)
tree1a532dad810d366a60fe1d828c0561a8047fe930
parent0f368efbf8a175ccf5ce859d43baa3f49e1db850 (diff)
added DC-Bitmask-unstable, changed hardcoded username in openrc/\* to $USER
-rw-r--r--openrc/DC-Bitmask-clientdev4
-rw-r--r--openrc/DC-Bitmask-development2
-rw-r--r--openrc/DC-Bitmask-production2
-rw-r--r--openrc/DC-Bitmask-unstable24
-rw-r--r--openrc/DC-OTF2
-rw-r--r--openrc/DC-Piston-Support2
-rw-r--r--openrc/DC-Playground2
-rw-r--r--openrc/HK-Bitmask-clientdev2
-rw-r--r--openrc/HK-LEAP.sh2
-rw-r--r--openrc/PP-OTF.sh2
-rw-r--r--openrc/PP-bitmask-proc.sh2
11 files changed, 35 insertions, 11 deletions
diff --git a/openrc/DC-Bitmask-clientdev b/openrc/DC-Bitmask-clientdev
index d2e57df..dbd9378 100644
--- a/openrc/DC-Bitmask-clientdev
+++ b/openrc/DC-Bitmask-clientdev
@@ -11,12 +11,12 @@ export OS_AUTH_URL=http://192.168.3.3:5000/v2.0
# With the addition of Keystone we have standardized on the term **tenant**
# as the entity that owns the resources.
-export OS_TENANT_ID=6bc8cfffad96400094bfc84f488beea9
+export OS_TENANT_ID=746052a7c9814aa29c70289fd7434e3d
export OS_TENANT_NAME="Bitmask clientdev"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/DC-Bitmask-development b/openrc/DC-Bitmask-development
index 63f27bb..1c1a5a6 100644
--- a/openrc/DC-Bitmask-development
+++ b/openrc/DC-Bitmask-development
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="Bitmask development"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/DC-Bitmask-production b/openrc/DC-Bitmask-production
index 46629b2..b294229 100644
--- a/openrc/DC-Bitmask-production
+++ b/openrc/DC-Bitmask-production
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="Bitmask production"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/DC-Bitmask-unstable b/openrc/DC-Bitmask-unstable
new file mode 100644
index 0000000..6cfbec3
--- /dev/null
+++ b/openrc/DC-Bitmask-unstable
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# 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=http://192.168.3.3:5000/v2.0
+
+# With the addition of Keystone we have standardized on the term **tenant**
+# as the entity that owns the resources.
+export OS_TENANT_ID=0474c842ec74454e83c9a5075b1aa67b
+export OS_TENANT_NAME="Bitmask unstable"
+
+# In addition to the owning entity (tenant), openstack stores the entity
+# performing the action as the **user**.
+export OS_USERNAME=$USER
+
+# With Keystone you pass the keystone password.
+echo "Please enter your OpenStack Password: "
+read -s OS_PASSWORD_INPUT
+export OS_PASSWORD=$OS_PASSWORD_INPUT
diff --git a/openrc/DC-OTF b/openrc/DC-OTF
index afef172..b19f1a1 100644
--- a/openrc/DC-OTF
+++ b/openrc/DC-OTF
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="OTF"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/DC-Piston-Support b/openrc/DC-Piston-Support
index 5b54a68..eeeb90e 100644
--- a/openrc/DC-Piston-Support
+++ b/openrc/DC-Piston-Support
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="Piston-Support"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/DC-Playground b/openrc/DC-Playground
index 5dd1a61..af36023 100644
--- a/openrc/DC-Playground
+++ b/openrc/DC-Playground
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="Playground"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/HK-Bitmask-clientdev b/openrc/HK-Bitmask-clientdev
index a0eb918..e6e95cc 100644
--- a/openrc/HK-Bitmask-clientdev
+++ b/openrc/HK-Bitmask-clientdev
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="Bitmask clientdev"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/HK-LEAP.sh b/openrc/HK-LEAP.sh
index d54d046..dabea82 100644
--- a/openrc/HK-LEAP.sh
+++ b/openrc/HK-LEAP.sh
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="LEAP"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/PP-OTF.sh b/openrc/PP-OTF.sh
index 30a0e51..cd6fb15 100644
--- a/openrc/PP-OTF.sh
+++ b/openrc/PP-OTF.sh
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="RFA"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "
diff --git a/openrc/PP-bitmask-proc.sh b/openrc/PP-bitmask-proc.sh
index b0597fd..ca3db37 100644
--- a/openrc/PP-bitmask-proc.sh
+++ b/openrc/PP-bitmask-proc.sh
@@ -16,7 +16,7 @@ export OS_TENANT_NAME="Bitmask production"
# In addition to the owning entity (tenant), openstack stores the entity
# performing the action as the **user**.
-export OS_USERNAME=kwadronaut
+export OS_USERNAME=$USER
# With Keystone you pass the keystone password.
echo "Please enter your OpenStack Password: "