There are several backward compatibility nits.
Change-Id: I93cac543375896602d158860cc557f86e41bcb63
| 1 | 1 |
new file mode 100755 |
| ... | ... |
@@ -0,0 +1,43 @@ |
| 0 |
+#!/usr/bin/env bash |
|
| 1 |
+ |
|
| 2 |
+# **sahara.sh** |
|
| 3 |
+ |
|
| 4 |
+# Sanity check that Sahara started if enabled |
|
| 5 |
+ |
|
| 6 |
+echo "*********************************************************************" |
|
| 7 |
+echo "Begin DevStack Exercise: $0" |
|
| 8 |
+echo "*********************************************************************" |
|
| 9 |
+ |
|
| 10 |
+# This script exits on an error so that errors don't compound and you see |
|
| 11 |
+# only the first error that occurred. |
|
| 12 |
+set -o errexit |
|
| 13 |
+ |
|
| 14 |
+# Print the commands being run so that we can see the command that triggers |
|
| 15 |
+# an error. It is also useful for following allowing as the install occurs. |
|
| 16 |
+set -o xtrace |
|
| 17 |
+ |
|
| 18 |
+ |
|
| 19 |
+# Settings |
|
| 20 |
+# ======== |
|
| 21 |
+ |
|
| 22 |
+# Keep track of the current directory |
|
| 23 |
+EXERCISE_DIR=$(cd $(dirname "$0") && pwd) |
|
| 24 |
+TOP_DIR=$(cd $EXERCISE_DIR/..; pwd) |
|
| 25 |
+ |
|
| 26 |
+# Import common functions |
|
| 27 |
+source $TOP_DIR/functions |
|
| 28 |
+ |
|
| 29 |
+# Import configuration |
|
| 30 |
+source $TOP_DIR/openrc |
|
| 31 |
+ |
|
| 32 |
+# Import exercise configuration |
|
| 33 |
+source $TOP_DIR/exerciserc |
|
| 34 |
+ |
|
| 35 |
+is_service_enabled sahara || exit 55 |
|
| 36 |
+ |
|
| 37 |
+curl http://$SERVICE_HOST:8386/ 2>/dev/null | grep -q 'Auth' || die $LINENO "Sahara API isn't functioning!" |
|
| 38 |
+ |
|
| 39 |
+set +o xtrace |
|
| 40 |
+echo "*********************************************************************" |
|
| 41 |
+echo "SUCCESS: End DevStack Exercise: $0" |
|
| 42 |
+echo "*********************************************************************" |
| 0 | 43 |
deleted file mode 100755 |
| ... | ... |
@@ -1,43 +0,0 @@ |
| 1 |
-#!/usr/bin/env bash |
|
| 2 |
- |
|
| 3 |
-# **savanna.sh** |
|
| 4 |
- |
|
| 5 |
-# Sanity check that Savanna started if enabled |
|
| 6 |
- |
|
| 7 |
-echo "*********************************************************************" |
|
| 8 |
-echo "Begin DevStack Exercise: $0" |
|
| 9 |
-echo "*********************************************************************" |
|
| 10 |
- |
|
| 11 |
-# This script exits on an error so that errors don't compound and you see |
|
| 12 |
-# only the first error that occurred. |
|
| 13 |
-set -o errexit |
|
| 14 |
- |
|
| 15 |
-# Print the commands being run so that we can see the command that triggers |
|
| 16 |
-# an error. It is also useful for following allowing as the install occurs. |
|
| 17 |
-set -o xtrace |
|
| 18 |
- |
|
| 19 |
- |
|
| 20 |
-# Settings |
|
| 21 |
-# ======== |
|
| 22 |
- |
|
| 23 |
-# Keep track of the current directory |
|
| 24 |
-EXERCISE_DIR=$(cd $(dirname "$0") && pwd) |
|
| 25 |
-TOP_DIR=$(cd $EXERCISE_DIR/..; pwd) |
|
| 26 |
- |
|
| 27 |
-# Import common functions |
|
| 28 |
-source $TOP_DIR/functions |
|
| 29 |
- |
|
| 30 |
-# Import configuration |
|
| 31 |
-source $TOP_DIR/openrc |
|
| 32 |
- |
|
| 33 |
-# Import exercise configuration |
|
| 34 |
-source $TOP_DIR/exerciserc |
|
| 35 |
- |
|
| 36 |
-is_service_enabled savanna || exit 55 |
|
| 37 |
- |
|
| 38 |
-curl http://$SERVICE_HOST:8386/ 2>/dev/null | grep -q 'Auth' || die $LINENO "Savanna API not functioning!" |
|
| 39 |
- |
|
| 40 |
-set +o xtrace |
|
| 41 |
-echo "*********************************************************************" |
|
| 42 |
-echo "SUCCESS: End DevStack Exercise: $0" |
|
| 43 |
-echo "*********************************************************************" |
| 44 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,37 @@ |
| 0 |
+# sahara.sh - DevStack extras script to install Sahara |
|
| 1 |
+ |
|
| 2 |
+if is_service_enabled sahara; then |
|
| 3 |
+ if [[ "$1" == "source" ]]; then |
|
| 4 |
+ # Initial source |
|
| 5 |
+ source $TOP_DIR/lib/sahara |
|
| 6 |
+ source $TOP_DIR/lib/sahara-dashboard |
|
| 7 |
+ elif [[ "$1" == "stack" && "$2" == "install" ]]; then |
|
| 8 |
+ echo_summary "Installing sahara" |
|
| 9 |
+ install_sahara |
|
| 10 |
+ cleanup_sahara |
|
| 11 |
+ if is_service_enabled horizon; then |
|
| 12 |
+ install_sahara_dashboard |
|
| 13 |
+ fi |
|
| 14 |
+ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then |
|
| 15 |
+ echo_summary "Configuring sahara" |
|
| 16 |
+ configure_sahara |
|
| 17 |
+ create_sahara_accounts |
|
| 18 |
+ if is_service_enabled horizon; then |
|
| 19 |
+ configure_sahara_dashboard |
|
| 20 |
+ fi |
|
| 21 |
+ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then |
|
| 22 |
+ echo_summary "Initializing sahara" |
|
| 23 |
+ start_sahara |
|
| 24 |
+ fi |
|
| 25 |
+ |
|
| 26 |
+ if [[ "$1" == "unstack" ]]; then |
|
| 27 |
+ stop_sahara |
|
| 28 |
+ if is_service_enabled horizon; then |
|
| 29 |
+ cleanup_sahara_dashboard |
|
| 30 |
+ fi |
|
| 31 |
+ fi |
|
| 32 |
+ |
|
| 33 |
+ if [[ "$1" == "clean" ]]; then |
|
| 34 |
+ cleanup_sahara |
|
| 35 |
+ fi |
|
| 36 |
+fi |
| 0 | 37 |
deleted file mode 100644 |
| ... | ... |
@@ -1,37 +0,0 @@ |
| 1 |
-# savanna.sh - DevStack extras script to install Savanna |
|
| 2 |
- |
|
| 3 |
-if is_service_enabled savanna; then |
|
| 4 |
- if [[ "$1" == "source" ]]; then |
|
| 5 |
- # Initial source |
|
| 6 |
- source $TOP_DIR/lib/savanna |
|
| 7 |
- source $TOP_DIR/lib/savanna-dashboard |
|
| 8 |
- elif [[ "$1" == "stack" && "$2" == "install" ]]; then |
|
| 9 |
- echo_summary "Installing Savanna" |
|
| 10 |
- install_savanna |
|
| 11 |
- cleanup_savanna |
|
| 12 |
- if is_service_enabled horizon; then |
|
| 13 |
- install_savanna_dashboard |
|
| 14 |
- fi |
|
| 15 |
- elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then |
|
| 16 |
- echo_summary "Configuring Savanna" |
|
| 17 |
- configure_savanna |
|
| 18 |
- create_savanna_accounts |
|
| 19 |
- if is_service_enabled horizon; then |
|
| 20 |
- configure_savanna_dashboard |
|
| 21 |
- fi |
|
| 22 |
- elif [[ "$1" == "stack" && "$2" == "extra" ]]; then |
|
| 23 |
- echo_summary "Initializing Savanna" |
|
| 24 |
- start_savanna |
|
| 25 |
- fi |
|
| 26 |
- |
|
| 27 |
- if [[ "$1" == "unstack" ]]; then |
|
| 28 |
- stop_savanna |
|
| 29 |
- if is_service_enabled horizon; then |
|
| 30 |
- cleanup_savanna_dashboard |
|
| 31 |
- fi |
|
| 32 |
- fi |
|
| 33 |
- |
|
| 34 |
- if [[ "$1" == "clean" ]]; then |
|
| 35 |
- cleanup_savanna |
|
| 36 |
- fi |
|
| 37 |
-fi |
| 38 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,177 @@ |
| 0 |
+# lib/sahara |
|
| 1 |
+ |
|
| 2 |
+# Dependencies: |
|
| 3 |
+# ``functions`` file |
|
| 4 |
+# ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined |
|
| 5 |
+ |
|
| 6 |
+# ``stack.sh`` calls the entry points in this order: |
|
| 7 |
+# |
|
| 8 |
+# install_sahara |
|
| 9 |
+# configure_sahara |
|
| 10 |
+# start_sahara |
|
| 11 |
+# stop_sahara |
|
| 12 |
+# cleanup_sahara |
|
| 13 |
+ |
|
| 14 |
+# Save trace setting |
|
| 15 |
+XTRACE=$(set +o | grep xtrace) |
|
| 16 |
+set +o xtrace |
|
| 17 |
+ |
|
| 18 |
+ |
|
| 19 |
+# Defaults |
|
| 20 |
+# -------- |
|
| 21 |
+ |
|
| 22 |
+# Set up default repos |
|
| 23 |
+SAHARA_REPO=${SAHARA_REPO:-${GIT_BASE}/openstack/sahara.git}
|
|
| 24 |
+SAHARA_BRANCH=${SAHARA_BRANCH:-master}
|
|
| 25 |
+ |
|
| 26 |
+# Set up default directories |
|
| 27 |
+SAHARA_DIR=$DEST/sahara |
|
| 28 |
+SAHARA_CONF_DIR=${SAHARA_CONF_DIR:-/etc/sahara}
|
|
| 29 |
+SAHARA_CONF_FILE=${SAHARA_CONF_DIR}/sahara.conf
|
|
| 30 |
+SAHARA_DEBUG=${SAHARA_DEBUG:-True}
|
|
| 31 |
+ |
|
| 32 |
+SAHARA_SERVICE_HOST=${SAHARA_SERVICE_HOST:-$SERVICE_HOST}
|
|
| 33 |
+SAHARA_SERVICE_PORT=${SAHARA_SERVICE_PORT:-8386}
|
|
| 34 |
+SAHARA_SERVICE_PROTOCOL=${SAHARA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
|
|
| 35 |
+ |
|
| 36 |
+SAHARA_AUTH_CACHE_DIR=${SAHARA_AUTH_CACHE_DIR:-/var/cache/sahara}
|
|
| 37 |
+ |
|
| 38 |
+# Support entry points installation of console scripts |
|
| 39 |
+if [[ -d $SAHARA_DIR/bin ]]; then |
|
| 40 |
+ SAHARA_BIN_DIR=$SAHARA_DIR/bin |
|
| 41 |
+else |
|
| 42 |
+ SAHARA_BIN_DIR=$(get_python_exec_prefix) |
|
| 43 |
+fi |
|
| 44 |
+ |
|
| 45 |
+# Tell Tempest this project is present |
|
| 46 |
+TEMPEST_SERVICES+=,sahara |
|
| 47 |
+ |
|
| 48 |
+# For backward compatibility with current tests in Tempest |
|
| 49 |
+TEMPEST_SERVICES+=,savanna |
|
| 50 |
+ |
|
| 51 |
+ |
|
| 52 |
+# Functions |
|
| 53 |
+# --------- |
|
| 54 |
+ |
|
| 55 |
+# create_sahara_accounts() - Set up common required sahara accounts |
|
| 56 |
+# |
|
| 57 |
+# Tenant User Roles |
|
| 58 |
+# ------------------------------ |
|
| 59 |
+# service sahara admin |
|
| 60 |
+function create_sahara_accounts {
|
|
| 61 |
+ |
|
| 62 |
+ SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
|
|
| 63 |
+ ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }")
|
|
| 64 |
+ |
|
| 65 |
+ SAHARA_USER=$(openstack user create \ |
|
| 66 |
+ sahara \ |
|
| 67 |
+ --password "$SERVICE_PASSWORD" \ |
|
| 68 |
+ --project $SERVICE_TENANT \ |
|
| 69 |
+ --email sahara@example.com \ |
|
| 70 |
+ | grep " id " | get_field 2) |
|
| 71 |
+ openstack role add \ |
|
| 72 |
+ $ADMIN_ROLE \ |
|
| 73 |
+ --project $SERVICE_TENANT \ |
|
| 74 |
+ --user $SAHARA_USER |
|
| 75 |
+ |
|
| 76 |
+ if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
| 77 |
+ SAHARA_SERVICE=$(openstack service create \ |
|
| 78 |
+ sahara \ |
|
| 79 |
+ --type=data_processing \ |
|
| 80 |
+ --description="Sahara Data Processing" \ |
|
| 81 |
+ | grep " id " | get_field 2) |
|
| 82 |
+ openstack endpoint create \ |
|
| 83 |
+ $SAHARA_SERVICE \ |
|
| 84 |
+ --region RegionOne \ |
|
| 85 |
+ --publicurl "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \ |
|
| 86 |
+ --adminurl "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" \ |
|
| 87 |
+ --internalurl "$SAHARA_SERVICE_PROTOCOL://$SAHARA_SERVICE_HOST:$SAHARA_SERVICE_PORT/v1.1/\$(tenant_id)s" |
|
| 88 |
+ fi |
|
| 89 |
+} |
|
| 90 |
+ |
|
| 91 |
+# cleanup_sahara() - Remove residual data files, anything left over from |
|
| 92 |
+# previous runs that would need to clean up. |
|
| 93 |
+function cleanup_sahara {
|
|
| 94 |
+ |
|
| 95 |
+ # Cleanup auth cache dir |
|
| 96 |
+ sudo rm -rf $SAHARA_AUTH_CACHE_DIR |
|
| 97 |
+} |
|
| 98 |
+ |
|
| 99 |
+# configure_sahara() - Set config files, create data dirs, etc |
|
| 100 |
+function configure_sahara {
|
|
| 101 |
+ |
|
| 102 |
+ if [[ ! -d $SAHARA_CONF_DIR ]]; then |
|
| 103 |
+ sudo mkdir -p $SAHARA_CONF_DIR |
|
| 104 |
+ fi |
|
| 105 |
+ sudo chown $STACK_USER $SAHARA_CONF_DIR |
|
| 106 |
+ |
|
| 107 |
+ # Copy over sahara configuration file and configure common parameters. |
|
| 108 |
+ # TODO(slukjanov): rename when sahara internals will be updated |
|
| 109 |
+ cp $SAHARA_DIR/etc/savanna/savanna.conf.sample $SAHARA_CONF_FILE |
|
| 110 |
+ |
|
| 111 |
+ # Create auth cache dir |
|
| 112 |
+ sudo mkdir -p $SAHARA_AUTH_CACHE_DIR |
|
| 113 |
+ sudo chown $STACK_USER $SAHARA_AUTH_CACHE_DIR |
|
| 114 |
+ rm -rf $SAHARA_AUTH_CACHE_DIR/* |
|
| 115 |
+ |
|
| 116 |
+ # Set obsolete keystone auth configs for backward compatibility |
|
| 117 |
+ iniset $SAHARA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_SERVICE_HOST |
|
| 118 |
+ iniset $SAHARA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_SERVICE_PORT |
|
| 119 |
+ iniset $SAHARA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_SERVICE_PROTOCOL |
|
| 120 |
+ iniset $SAHARA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD |
|
| 121 |
+ iniset $SAHARA_CONF_FILE DEFAULT os_admin_username sahara |
|
| 122 |
+ iniset $SAHARA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME |
|
| 123 |
+ |
|
| 124 |
+ # Set actual keystone auth configs |
|
| 125 |
+ iniset $SAHARA_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/ |
|
| 126 |
+ iniset $SAHARA_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
|
| 127 |
+ iniset $SAHARA_CONF_FILE keystone_authtoken admin_user sahara |
|
| 128 |
+ iniset $SAHARA_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD |
|
| 129 |
+ iniset $SAHARA_CONF_FILE keystone_authtoken signing_dir $SAHARA_AUTH_CACHE_DIR |
|
| 130 |
+ iniset $SAHARA_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA |
|
| 131 |
+ |
|
| 132 |
+ iniset $SAHARA_CONF_FILE DEFAULT debug $SAHARA_DEBUG |
|
| 133 |
+ |
|
| 134 |
+ iniset $SAHARA_CONF_FILE database connection `database_connection_url sahara` |
|
| 135 |
+ |
|
| 136 |
+ if is_service_enabled neutron; then |
|
| 137 |
+ iniset $SAHARA_CONF_FILE DEFAULT use_neutron true |
|
| 138 |
+ iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips true |
|
| 139 |
+ fi |
|
| 140 |
+ |
|
| 141 |
+ if is_service_enabled heat; then |
|
| 142 |
+ iniset $SAHARA_CONF_FILE DEFAULT infrastructure_engine heat |
|
| 143 |
+ else |
|
| 144 |
+ iniset $SAHARA_CONF_FILE DEFAULT infrastructure_engine direct |
|
| 145 |
+ fi |
|
| 146 |
+ |
|
| 147 |
+ iniset $SAHARA_CONF_FILE DEFAULT use_syslog $SYSLOG |
|
| 148 |
+ |
|
| 149 |
+ recreate_database sahara utf8 |
|
| 150 |
+ $SAHARA_BIN_DIR/sahara-db-manage --config-file $SAHARA_CONF_FILE upgrade head |
|
| 151 |
+} |
|
| 152 |
+ |
|
| 153 |
+# install_sahara() - Collect source and prepare |
|
| 154 |
+function install_sahara {
|
|
| 155 |
+ git_clone $SAHARA_REPO $SAHARA_DIR $SAHARA_BRANCH |
|
| 156 |
+ setup_develop $SAHARA_DIR |
|
| 157 |
+} |
|
| 158 |
+ |
|
| 159 |
+# start_sahara() - Start running processes, including screen |
|
| 160 |
+function start_sahara {
|
|
| 161 |
+ screen_it sahara "cd $SAHARA_DIR && $SAHARA_BIN_DIR/sahara-api --config-file $SAHARA_CONF_FILE" |
|
| 162 |
+} |
|
| 163 |
+ |
|
| 164 |
+# stop_sahara() - Stop running processes |
|
| 165 |
+function stop_sahara {
|
|
| 166 |
+ # Kill the Sahara screen windows |
|
| 167 |
+ screen -S $SCREEN_NAME -p sahara -X kill |
|
| 168 |
+} |
|
| 169 |
+ |
|
| 170 |
+ |
|
| 171 |
+# Restore xtrace |
|
| 172 |
+$XTRACE |
|
| 173 |
+ |
|
| 174 |
+# Local variables: |
|
| 175 |
+# mode: shell-script |
|
| 176 |
+# End: |
| 0 | 177 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,72 @@ |
| 0 |
+# lib/sahara-dashboard |
|
| 1 |
+ |
|
| 2 |
+# Dependencies: |
|
| 3 |
+# |
|
| 4 |
+# - ``functions`` file |
|
| 5 |
+# - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined |
|
| 6 |
+# - ``SERVICE_HOST`` |
|
| 7 |
+ |
|
| 8 |
+# ``stack.sh`` calls the entry points in this order: |
|
| 9 |
+# |
|
| 10 |
+# - install_sahara_dashboard |
|
| 11 |
+# - configure_sahara_dashboard |
|
| 12 |
+# - cleanup_sahara_dashboard |
|
| 13 |
+ |
|
| 14 |
+# Save trace setting |
|
| 15 |
+XTRACE=$(set +o | grep xtrace) |
|
| 16 |
+set +o xtrace |
|
| 17 |
+ |
|
| 18 |
+source $TOP_DIR/lib/horizon |
|
| 19 |
+ |
|
| 20 |
+# Defaults |
|
| 21 |
+# -------- |
|
| 22 |
+ |
|
| 23 |
+# Set up default repos |
|
| 24 |
+SAHARA_DASHBOARD_REPO=${SAHARA_DASHBOARD_REPO:-${GIT_BASE}/openstack/sahara-dashboard.git}
|
|
| 25 |
+SAHARA_DASHBOARD_BRANCH=${SAHARA_DASHBOARD_BRANCH:-master}
|
|
| 26 |
+ |
|
| 27 |
+SAHARA_PYTHONCLIENT_REPO=${SAHARA_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-saharaclient.git}
|
|
| 28 |
+SAHARA_PYTHONCLIENT_BRANCH=${SAHARA_PYTHONCLIENT_BRANCH:-master}
|
|
| 29 |
+ |
|
| 30 |
+# Set up default directories |
|
| 31 |
+SAHARA_DASHBOARD_DIR=$DEST/sahara-dashboard |
|
| 32 |
+SAHARA_PYTHONCLIENT_DIR=$DEST/python-saharaclient |
|
| 33 |
+ |
|
| 34 |
+# Functions |
|
| 35 |
+# --------- |
|
| 36 |
+ |
|
| 37 |
+function configure_sahara_dashboard {
|
|
| 38 |
+ |
|
| 39 |
+ echo -e "AUTO_ASSIGNMENT_ENABLED = False" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py |
|
| 40 |
+ echo -e "HORIZON_CONFIG['dashboards'] += ('sahara',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
|
|
| 41 |
+ echo -e "INSTALLED_APPS += ('saharadashboard',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
|
|
| 42 |
+ |
|
| 43 |
+ if is_service_enabled neutron; then |
|
| 44 |
+ echo -e "SAHARA_USE_NEUTRON = True" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py |
|
| 45 |
+ fi |
|
| 46 |
+} |
|
| 47 |
+ |
|
| 48 |
+# install_sahara_dashboard() - Collect source and prepare |
|
| 49 |
+function install_sahara_dashboard {
|
|
| 50 |
+ install_python_saharaclient |
|
| 51 |
+ git_clone $SAHARA_DASHBOARD_REPO $SAHARA_DASHBOARD_DIR $SAHARA_DASHBOARD_BRANCH |
|
| 52 |
+ setup_develop $SAHARA_DASHBOARD_DIR |
|
| 53 |
+} |
|
| 54 |
+ |
|
| 55 |
+function install_python_saharaclient {
|
|
| 56 |
+ git_clone $SAHARA_PYTHONCLIENT_REPO $SAHARA_PYTHONCLIENT_DIR $SAHARA_PYTHONCLIENT_BRANCH |
|
| 57 |
+ setup_develop $SAHARA_PYTHONCLIENT_DIR |
|
| 58 |
+} |
|
| 59 |
+ |
|
| 60 |
+# Cleanup file settings.py from Sahara |
|
| 61 |
+function cleanup_sahara_dashboard {
|
|
| 62 |
+ sed -i '/sahara/d' $HORIZON_DIR/openstack_dashboard/settings.py |
|
| 63 |
+} |
|
| 64 |
+ |
|
| 65 |
+# Restore xtrace |
|
| 66 |
+$XTRACE |
|
| 67 |
+ |
|
| 68 |
+# Local variables: |
|
| 69 |
+# mode: shell-script |
|
| 70 |
+# End: |
|
| 71 |
+ |
| 0 | 72 |
deleted file mode 100644 |
| ... | ... |
@@ -1,173 +0,0 @@ |
| 1 |
-# lib/savanna |
|
| 2 |
- |
|
| 3 |
-# Dependencies: |
|
| 4 |
-# ``functions`` file |
|
| 5 |
-# ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined |
|
| 6 |
- |
|
| 7 |
-# ``stack.sh`` calls the entry points in this order: |
|
| 8 |
-# |
|
| 9 |
-# install_savanna |
|
| 10 |
-# configure_savanna |
|
| 11 |
-# start_savanna |
|
| 12 |
-# stop_savanna |
|
| 13 |
-# cleanup_savanna |
|
| 14 |
- |
|
| 15 |
-# Save trace setting |
|
| 16 |
-XTRACE=$(set +o | grep xtrace) |
|
| 17 |
-set +o xtrace |
|
| 18 |
- |
|
| 19 |
- |
|
| 20 |
-# Defaults |
|
| 21 |
-# -------- |
|
| 22 |
- |
|
| 23 |
-# Set up default repos |
|
| 24 |
-SAVANNA_REPO=${SAVANNA_REPO:-${GIT_BASE}/openstack/savanna.git}
|
|
| 25 |
-SAVANNA_BRANCH=${SAVANNA_BRANCH:-master}
|
|
| 26 |
- |
|
| 27 |
-# Set up default directories |
|
| 28 |
-SAVANNA_DIR=$DEST/savanna |
|
| 29 |
-SAVANNA_CONF_DIR=${SAVANNA_CONF_DIR:-/etc/savanna}
|
|
| 30 |
-SAVANNA_CONF_FILE=${SAVANNA_CONF_DIR}/savanna.conf
|
|
| 31 |
-SAVANNA_DEBUG=${SAVANNA_DEBUG:-True}
|
|
| 32 |
- |
|
| 33 |
-SAVANNA_SERVICE_HOST=${SAVANNA_SERVICE_HOST:-$SERVICE_HOST}
|
|
| 34 |
-SAVANNA_SERVICE_PORT=${SAVANNA_SERVICE_PORT:-8386}
|
|
| 35 |
-SAVANNA_SERVICE_PROTOCOL=${SAVANNA_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
|
|
| 36 |
- |
|
| 37 |
-SAVANNA_AUTH_CACHE_DIR=${SAVANNA_AUTH_CACHE_DIR:-/var/cache/savanna}
|
|
| 38 |
- |
|
| 39 |
-# Support entry points installation of console scripts |
|
| 40 |
-if [[ -d $SAVANNA_DIR/bin ]]; then |
|
| 41 |
- SAVANNA_BIN_DIR=$SAVANNA_DIR/bin |
|
| 42 |
-else |
|
| 43 |
- SAVANNA_BIN_DIR=$(get_python_exec_prefix) |
|
| 44 |
-fi |
|
| 45 |
- |
|
| 46 |
-# Tell Tempest this project is present |
|
| 47 |
-TEMPEST_SERVICES+=,savanna |
|
| 48 |
- |
|
| 49 |
- |
|
| 50 |
-# Functions |
|
| 51 |
-# --------- |
|
| 52 |
- |
|
| 53 |
-# create_savanna_accounts() - Set up common required savanna accounts |
|
| 54 |
-# |
|
| 55 |
-# Tenant User Roles |
|
| 56 |
-# ------------------------------ |
|
| 57 |
-# service savanna admin |
|
| 58 |
-function create_savanna_accounts {
|
|
| 59 |
- |
|
| 60 |
- SERVICE_TENANT=$(openstack project list | awk "/ $SERVICE_TENANT_NAME / { print \$2 }")
|
|
| 61 |
- ADMIN_ROLE=$(openstack role list | awk "/ admin / { print \$2 }")
|
|
| 62 |
- |
|
| 63 |
- SAVANNA_USER=$(openstack user create \ |
|
| 64 |
- savanna \ |
|
| 65 |
- --password "$SERVICE_PASSWORD" \ |
|
| 66 |
- --project $SERVICE_TENANT \ |
|
| 67 |
- --email savanna@example.com \ |
|
| 68 |
- | grep " id " | get_field 2) |
|
| 69 |
- openstack role add \ |
|
| 70 |
- $ADMIN_ROLE \ |
|
| 71 |
- --project $SERVICE_TENANT \ |
|
| 72 |
- --user $SAVANNA_USER |
|
| 73 |
- |
|
| 74 |
- if [[ "$KEYSTONE_CATALOG_BACKEND" = 'sql' ]]; then |
|
| 75 |
- SAVANNA_SERVICE=$(openstack service create \ |
|
| 76 |
- savanna \ |
|
| 77 |
- --type=data_processing \ |
|
| 78 |
- --description="Savanna Data Processing" \ |
|
| 79 |
- | grep " id " | get_field 2) |
|
| 80 |
- openstack endpoint create \ |
|
| 81 |
- $SAVANNA_SERVICE \ |
|
| 82 |
- --region RegionOne \ |
|
| 83 |
- --publicurl "$SAVANNA_SERVICE_PROTOCOL://$SAVANNA_SERVICE_HOST:$SAVANNA_SERVICE_PORT/v1.1/\$(tenant_id)s" \ |
|
| 84 |
- --adminurl "$SAVANNA_SERVICE_PROTOCOL://$SAVANNA_SERVICE_HOST:$SAVANNA_SERVICE_PORT/v1.1/\$(tenant_id)s" \ |
|
| 85 |
- --internalurl "$SAVANNA_SERVICE_PROTOCOL://$SAVANNA_SERVICE_HOST:$SAVANNA_SERVICE_PORT/v1.1/\$(tenant_id)s" |
|
| 86 |
- fi |
|
| 87 |
-} |
|
| 88 |
- |
|
| 89 |
-# cleanup_savanna() - Remove residual data files, anything left over from |
|
| 90 |
-# previous runs that would need to clean up. |
|
| 91 |
-function cleanup_savanna {
|
|
| 92 |
- |
|
| 93 |
- # Cleanup auth cache dir |
|
| 94 |
- sudo rm -rf $SAVANNA_AUTH_CACHE_DIR |
|
| 95 |
-} |
|
| 96 |
- |
|
| 97 |
-# configure_savanna() - Set config files, create data dirs, etc |
|
| 98 |
-function configure_savanna {
|
|
| 99 |
- |
|
| 100 |
- if [[ ! -d $SAVANNA_CONF_DIR ]]; then |
|
| 101 |
- sudo mkdir -p $SAVANNA_CONF_DIR |
|
| 102 |
- fi |
|
| 103 |
- sudo chown $STACK_USER $SAVANNA_CONF_DIR |
|
| 104 |
- |
|
| 105 |
- # Copy over savanna configuration file and configure common parameters. |
|
| 106 |
- cp $SAVANNA_DIR/etc/savanna/savanna.conf.sample $SAVANNA_CONF_FILE |
|
| 107 |
- |
|
| 108 |
- # Create auth cache dir |
|
| 109 |
- sudo mkdir -p $SAVANNA_AUTH_CACHE_DIR |
|
| 110 |
- sudo chown $STACK_USER $SAVANNA_AUTH_CACHE_DIR |
|
| 111 |
- rm -rf $SAVANNA_AUTH_CACHE_DIR/* |
|
| 112 |
- |
|
| 113 |
- # Set obsolete keystone auth configs for backward compatibility |
|
| 114 |
- iniset $SAVANNA_CONF_FILE DEFAULT os_auth_host $KEYSTONE_SERVICE_HOST |
|
| 115 |
- iniset $SAVANNA_CONF_FILE DEFAULT os_auth_port $KEYSTONE_SERVICE_PORT |
|
| 116 |
- iniset $SAVANNA_CONF_FILE DEFAULT os_auth_protocol $KEYSTONE_SERVICE_PROTOCOL |
|
| 117 |
- iniset $SAVANNA_CONF_FILE DEFAULT os_admin_password $SERVICE_PASSWORD |
|
| 118 |
- iniset $SAVANNA_CONF_FILE DEFAULT os_admin_username savanna |
|
| 119 |
- iniset $SAVANNA_CONF_FILE DEFAULT os_admin_tenant_name $SERVICE_TENANT_NAME |
|
| 120 |
- |
|
| 121 |
- # Set actual keystone auth configs |
|
| 122 |
- iniset $SAVANNA_CONF_FILE keystone_authtoken auth_uri $KEYSTONE_SERVICE_PROTOCOL://$KEYSTONE_SERVICE_HOST:$KEYSTONE_SERVICE_PORT/ |
|
| 123 |
- iniset $SAVANNA_CONF_FILE keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME |
|
| 124 |
- iniset $SAVANNA_CONF_FILE keystone_authtoken admin_user savanna |
|
| 125 |
- iniset $SAVANNA_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD |
|
| 126 |
- iniset $SAVANNA_CONF_FILE keystone_authtoken signing_dir $SAVANNA_AUTH_CACHE_DIR |
|
| 127 |
- iniset $SAVANNA_CONF_FILE keystone_authtoken cafile $KEYSTONE_SSL_CA |
|
| 128 |
- |
|
| 129 |
- iniset $SAVANNA_CONF_FILE DEFAULT debug $SAVANNA_DEBUG |
|
| 130 |
- |
|
| 131 |
- iniset $SAVANNA_CONF_FILE database connection `database_connection_url savanna` |
|
| 132 |
- |
|
| 133 |
- if is_service_enabled neutron; then |
|
| 134 |
- iniset $SAVANNA_CONF_FILE DEFAULT use_neutron true |
|
| 135 |
- iniset $SAVANNA_CONF_FILE DEFAULT use_floating_ips true |
|
| 136 |
- fi |
|
| 137 |
- |
|
| 138 |
- if is_service_enabled heat; then |
|
| 139 |
- iniset $SAVANNA_CONF_FILE DEFAULT infrastructure_engine heat |
|
| 140 |
- else |
|
| 141 |
- iniset $SAVANNA_CONF_FILE DEFAULT infrastructure_engine savanna |
|
| 142 |
- fi |
|
| 143 |
- |
|
| 144 |
- iniset $SAVANNA_CONF_FILE DEFAULT use_syslog $SYSLOG |
|
| 145 |
- |
|
| 146 |
- recreate_database savanna utf8 |
|
| 147 |
- $SAVANNA_BIN_DIR/savanna-db-manage --config-file $SAVANNA_CONF_FILE upgrade head |
|
| 148 |
-} |
|
| 149 |
- |
|
| 150 |
-# install_savanna() - Collect source and prepare |
|
| 151 |
-function install_savanna {
|
|
| 152 |
- git_clone $SAVANNA_REPO $SAVANNA_DIR $SAVANNA_BRANCH |
|
| 153 |
- setup_develop $SAVANNA_DIR |
|
| 154 |
-} |
|
| 155 |
- |
|
| 156 |
-# start_savanna() - Start running processes, including screen |
|
| 157 |
-function start_savanna {
|
|
| 158 |
- screen_it savanna "cd $SAVANNA_DIR && $SAVANNA_BIN_DIR/savanna-api --config-file $SAVANNA_CONF_FILE" |
|
| 159 |
-} |
|
| 160 |
- |
|
| 161 |
-# stop_savanna() - Stop running processes |
|
| 162 |
-function stop_savanna {
|
|
| 163 |
- # Kill the Savanna screen windows |
|
| 164 |
- screen -S $SCREEN_NAME -p savanna -X kill |
|
| 165 |
-} |
|
| 166 |
- |
|
| 167 |
- |
|
| 168 |
-# Restore xtrace |
|
| 169 |
-$XTRACE |
|
| 170 |
- |
|
| 171 |
-# Local variables: |
|
| 172 |
-# mode: shell-script |
|
| 173 |
-# End: |
| 174 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,72 +0,0 @@ |
| 1 |
-# lib/savanna-dashboard |
|
| 2 |
- |
|
| 3 |
-# Dependencies: |
|
| 4 |
-# |
|
| 5 |
-# - ``functions`` file |
|
| 6 |
-# - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined |
|
| 7 |
-# - ``SERVICE_HOST`` |
|
| 8 |
- |
|
| 9 |
-# ``stack.sh`` calls the entry points in this order: |
|
| 10 |
-# |
|
| 11 |
-# - install_savanna_dashboard |
|
| 12 |
-# - configure_savanna_dashboard |
|
| 13 |
-# - cleanup_savanna_dashboard |
|
| 14 |
- |
|
| 15 |
-# Save trace setting |
|
| 16 |
-XTRACE=$(set +o | grep xtrace) |
|
| 17 |
-set +o xtrace |
|
| 18 |
- |
|
| 19 |
-source $TOP_DIR/lib/horizon |
|
| 20 |
- |
|
| 21 |
-# Defaults |
|
| 22 |
-# -------- |
|
| 23 |
- |
|
| 24 |
-# Set up default repos |
|
| 25 |
-SAVANNA_DASHBOARD_REPO=${SAVANNA_DASHBOARD_REPO:-${GIT_BASE}/openstack/savanna-dashboard.git}
|
|
| 26 |
-SAVANNA_DASHBOARD_BRANCH=${SAVANNA_DASHBOARD_BRANCH:-master}
|
|
| 27 |
- |
|
| 28 |
-SAVANNA_PYTHONCLIENT_REPO=${SAVANNA_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-savannaclient.git}
|
|
| 29 |
-SAVANNA_PYTHONCLIENT_BRANCH=${SAVANNA_PYTHONCLIENT_BRANCH:-master}
|
|
| 30 |
- |
|
| 31 |
-# Set up default directories |
|
| 32 |
-SAVANNA_DASHBOARD_DIR=$DEST/savanna-dashboard |
|
| 33 |
-SAVANNA_PYTHONCLIENT_DIR=$DEST/python-savannaclient |
|
| 34 |
- |
|
| 35 |
-# Functions |
|
| 36 |
-# --------- |
|
| 37 |
- |
|
| 38 |
-function configure_savanna_dashboard {
|
|
| 39 |
- |
|
| 40 |
- echo -e "AUTO_ASSIGNMENT_ENABLED = False" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py |
|
| 41 |
- echo -e "HORIZON_CONFIG['dashboards'] += ('savanna',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
|
|
| 42 |
- echo -e "INSTALLED_APPS += ('savannadashboard',)" >> $HORIZON_DIR/openstack_dashboard/settings.py
|
|
| 43 |
- |
|
| 44 |
- if is_service_enabled neutron; then |
|
| 45 |
- echo -e "SAVANNA_USE_NEUTRON = True" >> $HORIZON_DIR/openstack_dashboard/local/local_settings.py |
|
| 46 |
- fi |
|
| 47 |
-} |
|
| 48 |
- |
|
| 49 |
-# install_savanna_dashboard() - Collect source and prepare |
|
| 50 |
-function install_savanna_dashboard {
|
|
| 51 |
- install_python_savannaclient |
|
| 52 |
- git_clone $SAVANNA_DASHBOARD_REPO $SAVANNA_DASHBOARD_DIR $SAVANNA_DASHBOARD_BRANCH |
|
| 53 |
- setup_develop $SAVANNA_DASHBOARD_DIR |
|
| 54 |
-} |
|
| 55 |
- |
|
| 56 |
-function install_python_savannaclient {
|
|
| 57 |
- git_clone $SAVANNA_PYTHONCLIENT_REPO $SAVANNA_PYTHONCLIENT_DIR $SAVANNA_PYTHONCLIENT_BRANCH |
|
| 58 |
- setup_develop $SAVANNA_PYTHONCLIENT_DIR |
|
| 59 |
-} |
|
| 60 |
- |
|
| 61 |
-# Cleanup file settings.py from Savanna |
|
| 62 |
-function cleanup_savanna_dashboard {
|
|
| 63 |
- sed -i '/savanna/d' $HORIZON_DIR/openstack_dashboard/settings.py |
|
| 64 |
-} |
|
| 65 |
- |
|
| 66 |
-# Restore xtrace |
|
| 67 |
-$XTRACE |
|
| 68 |
- |
|
| 69 |
-# Local variables: |
|
| 70 |
-# mode: shell-script |
|
| 71 |
-# End: |
|
| 72 |
- |