From c80340d50ba7615536da0c217f44b06d9ada2def Mon Sep 17 00:00:00 2001 From: Zhou Ya Date: Thu, 8 Dec 2016 15:21:45 +0800 Subject: [PATCH] modify reverted change 'Migrate from keystone v2.0 to v3' Change-Id: I6a1ed896bc20f5761ee53a7fba9b45a1dc8c97b6 --- .../openstack_dashboard/local/local_settings.py.example | 6 +++--- tools/setup/install/install_interface.sh | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/code/horizon/openstack_dashboard/local/local_settings.py.example b/code/horizon/openstack_dashboard/local/local_settings.py.example index 0e67fe54..c5ba8724 100644 --- a/code/horizon/openstack_dashboard/local/local_settings.py.example +++ b/code/horizon/openstack_dashboard/local/local_settings.py.example @@ -45,11 +45,11 @@ WEBROOT = '/' # NOTE: The version should be formatted as it appears in the URL for the # service API. For example, The identity service APIs have inconsistent # use of the decimal point, so valid options would be 2.0 or 3. -#OPENSTACK_API_VERSIONS = { +OPENSTACK_API_VERSIONS = { # "data-processing": 1.1, -# "identity": 3, + "identity": 3, # "volume": 2, -#} +} # Set this to True if running on multi-domain model. When this is enabled, it # will require user to enter the Domain name in addition to username for login. diff --git a/tools/setup/install/install_interface.sh b/tools/setup/install/install_interface.sh index c7e143e2..58fd6fcd 100644 --- a/tools/setup/install/install_interface.sh +++ b/tools/setup/install/install_interface.sh @@ -58,6 +58,9 @@ function all_install write_install_log "install keystone rpm" install_rpm_by_yum "openstack-keystone" + write_install_log "install python-openstackclient rpm" + install_rpm_by_yum "python-openstackclient" + write_install_log "install ironic-discoverd depend rpm" install_rpm_by_yum "python-flask" @@ -194,6 +197,11 @@ function all_install [ "$?" -ne 0 ] && { write_install_log "Error:keystone-manage bootstrap command failed"; exit 1; } fi + openstack project create --domain default --description "Demo Project" demo + openstack user create --domain default --password daisy daisy + openstack role create user + openstack role add --project demo --user daisy user + #creat daisy datebase tables which daisy-manage >> $install_logfile 2>&1 if [ "$?" == 0 ];then