diff --git a/labs/config/labs-openstackrc.sh b/labs/config/admin-openstackrc.sh similarity index 100% rename from labs/config/labs-openstackrc.sh rename to labs/config/admin-openstackrc.sh diff --git a/labs/scripts/setup_cinder_controller.sh b/labs/scripts/setup_cinder_controller.sh index 29769e1d..b728bd48 100755 --- a/labs/scripts/setup_cinder_controller.sh +++ b/labs/scripts/setup_cinder_controller.sh @@ -3,7 +3,7 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" exec_logfile indicate_current_auto diff --git a/labs/scripts/setup_cinder_volumes.sh b/labs/scripts/setup_cinder_volumes.sh index 5192ac6d..e1355a5e 100755 --- a/labs/scripts/setup_cinder_volumes.sh +++ b/labs/scripts/setup_cinder_volumes.sh @@ -4,7 +4,7 @@ source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$CONFIG_DIR/openstack" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" exec_logfile indicate_current_auto diff --git a/labs/scripts/setup_glance.sh b/labs/scripts/setup_glance.sh index 85f6d4d4..69c0373b 100755 --- a/labs/scripts/setup_glance.sh +++ b/labs/scripts/setup_glance.sh @@ -3,7 +3,7 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" exec_logfile indicate_current_auto diff --git a/labs/scripts/setup_keystone.sh b/labs/scripts/setup_keystone.sh index 32efd6d4..598d49f6 100755 --- a/labs/scripts/setup_keystone.sh +++ b/labs/scripts/setup_keystone.sh @@ -100,7 +100,7 @@ echo "Verifying keystone installation." unset OS_SERVICE_TOKEN OS_SERVICE_ENDPOINT # Load keystone credentials -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" # The output of the following commands can be used to verify or debug the # service. diff --git a/labs/scripts/setup_neutron_compute.sh b/labs/scripts/setup_neutron_compute.sh index 338ccb24..51c0dcf6 100755 --- a/labs/scripts/setup_neutron_compute.sh +++ b/labs/scripts/setup_neutron_compute.sh @@ -3,7 +3,7 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" exec_logfile indicate_current_auto diff --git a/labs/scripts/setup_neutron_controller.sh b/labs/scripts/setup_neutron_controller.sh index 530a19ae..ae188147 100755 --- a/labs/scripts/setup_neutron_controller.sh +++ b/labs/scripts/setup_neutron_controller.sh @@ -3,7 +3,7 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" exec_logfile indicate_current_auto diff --git a/labs/scripts/setup_nova_compute.sh b/labs/scripts/setup_nova_compute.sh index 1a02328f..435f95ba 100755 --- a/labs/scripts/setup_nova_compute.sh +++ b/labs/scripts/setup_nova_compute.sh @@ -3,7 +3,7 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" exec_logfile indicate_current_auto diff --git a/labs/scripts/setup_nova_controller.sh b/labs/scripts/setup_nova_controller.sh index f0977283..5257eb7d 100755 --- a/labs/scripts/setup_nova_controller.sh +++ b/labs/scripts/setup_nova_controller.sh @@ -3,7 +3,7 @@ TOP_DIR=$(cd $(dirname "$0")/.. && pwd) source "$TOP_DIR/config/paths" source "$CONFIG_DIR/credentials" source "$LIB_DIR/functions.guest" -source "$CONFIG_DIR/labs-openstackrc.sh" +source "$CONFIG_DIR/admin-openstackrc.sh" exec_logfile indicate_current_auto