aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiam R. Howlett <Liam.Howlett@WindRiver.com>2014-07-30 17:05:34 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-07-31 16:10:30 -0400
commit8dfdfd8d1b55d7c0fc8899dc65400fdbc2d94ba9 (patch)
treebde0833c6975cc091d384eb26fddd70b9661ae23
parenta876278442bb035f0c55a3edf0742febf9a6d6a9 (diff)
downloadmeta-cloud-services-8dfdfd8d1b55d7c0fc8899dc65400fdbc2d94ba9.tar.gz
meta-cloud-services-8dfdfd8d1b55d7c0fc8899dc65400fdbc2d94ba9.tar.bz2
meta-cloud-services-8dfdfd8d1b55d7c0fc8899dc65400fdbc2d94ba9.zip
python-keystone: Remove openrc file and bb references.
This patch removes the openrc file from the keystone package and references to openrc in the python-kystone_git.bb file. Signed-off-by: Liam R. Howlett <Liam.Howlett@WindRiver.com>
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone/openrc6
-rw-r--r--meta-openstack/recipes-devtools/python/python-keystone_git.bb2
2 files changed, 0 insertions, 8 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystone/openrc b/meta-openstack/recipes-devtools/python/python-keystone/openrc
deleted file mode 100644
index 1d0a1ea..0000000
--- a/meta-openstack/recipes-devtools/python/python-keystone/openrc
+++ /dev/null
@@ -1,6 +0,0 @@
-export OS_TENANT_NAME=admin
-export OS_USERNAME=admin
-export OS_PASSWORD=%OS_PASSWORD%
-export OS_AUTH_URL="http://localhost:5000/v2.0/"
-export SERVICE_ENDPOINT="http://localhost:35357/v2.0"
-export SERVICE_TOKEN=%SERVICE_TOKEN%
diff --git a/meta-openstack/recipes-devtools/python/python-keystone_git.bb b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
index 6ce1963..f242844 100644
--- a/meta-openstack/recipes-devtools/python/python-keystone_git.bb
+++ b/meta-openstack/recipes-devtools/python/python-keystone_git.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/havana \
file://keystone.conf \
file://identity.sh \
file://keystone \
- file://openrc \
file://keystone-search-in-etc-directory-for-config-files.patch \
file://keystone-fix-location-of-files-for-tests.patch \
file://keystone-remove-git-commands-in-tests.patch \
@@ -68,7 +67,6 @@ do_install_append() {
install -m 600 ${WORKDIR}/keystone.conf ${KEYSTONE_CONF_DIR}/
install -m 755 ${WORKDIR}/identity.sh ${KEYSTONE_CONF_DIR}/
- install -m 600 ${WORKDIR}/openrc ${KEYSTONE_CONF_DIR}/
install -m 600 ${S}/etc/logging.conf.sample ${KEYSTONE_CONF_DIR}/logging.conf
install -m 600 ${S}/etc/policy.json ${KEYSTONE_CONF_DIR}/policy.json
install -m 600 ${S}/etc/keystone.conf.sample ${KEYSTONE_CONF_DIR}/keystone.conf.sample