summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-12 19:11:02 +0000
committerGerrit Code Review <review@openstack.org>2017-07-12 19:11:02 +0000
commitf6dd0d982a8cda5f27057711c70837fde6e91c41 (patch)
tree8b640d589ab9e340a2b44af3d3b02fa528340660 /devstack
parentdeb07840475a73f0917ec22197f7872ac807b054 (diff)
parent977cc53f9c9b98c00390e98dec46eed11c9cd2d7 (diff)
Merge "Remove keystone pki_setup"
Diffstat (limited to 'devstack')
-rw-r--r--devstack/lib/ceph5
1 files changed, 0 insertions, 5 deletions
diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index fa40f6f..7d20415 100644
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -595,9 +595,6 @@ function configure_ceph_embedded_rgw {
595 _create_swift_endpoint 595 _create_swift_endpoint
596 fi 596 fi
597 597
598 # Let keystone generate the certs, rgw needs these.
599 keystone-manage pki_setup --rebuild
600
601 # Create radosgw service user with admin privileges 598 # Create radosgw service user with admin privileges
602 create_service_user "radosgw" "admin" 599 create_service_user "radosgw" "admin"
603 600
@@ -611,8 +608,6 @@ function configure_ceph_embedded_rgw {
611} 608}
612 609
613function start_ceph_embedded_rgw { 610function start_ceph_embedded_rgw {
614 # radosgw service is started here as it needs the keystone pki_setup as a
615 # pre-requisite
616 if [[ $INIT_SYSTEM == 'upstart' ]] ; then 611 if [[ $INIT_SYSTEM == 'upstart' ]] ; then
617 sudo start radosgw id=radosgw.$(hostname) 612 sudo start radosgw id=radosgw.$(hostname)
618 elif [[ $INIT_SYSTEM == 'systemd' ]] ; then 613 elif [[ $INIT_SYSTEM == 'systemd' ]] ; then