Merge "Revert "Migrate from keystone v2.0 to v3""

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.

tools/setup/install/install_interface.sh

@@ -58,9 +58,6 @@ 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"
 
@@ -128,11 +125,6 @@ function all_install
             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
         local create_db_sql="create database IF NOT EXISTS $db_name default charset=utf8"
         write_install_log "create $db_name database in mariadb"