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:07:26 -0400
commit6f179e8d7420afd801b5096f800d300ff96b4ba1 (patch)
tree42262bfa6d5c65084715d49021576845600d0a5e
parent3fe67ae52ab03c363c9ab0a8f952054ecec28db7 (diff)
downloadmeta-cloud-services-6f179e8d7420afd801b5096f800d300ff96b4ba1.tar.gz
meta-cloud-services-6f179e8d7420afd801b5096f800d300ff96b4ba1.tar.bz2
meta-cloud-services-6f179e8d7420afd801b5096f800d300ff96b4ba1.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 e1af24d..f62d536 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