Merge "Remove SCREEN_LOGDIR from devstack"
This commit is contained in:
commit
e579cc5943
|
@ -25,7 +25,6 @@ SERVICE_TOKEN=abc123
|
||||||
|
|
||||||
LOG_COLOR=False
|
LOG_COLOR=False
|
||||||
DEST=/opt/stack/new
|
DEST=/opt/stack/new
|
||||||
SCREEN_LOGDIR=$DEST/logs/screen
|
|
||||||
LOGFILE=$DEST/logs/stack.sh.log
|
LOGFILE=$DEST/logs/stack.sh.log
|
||||||
|
|
||||||
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
||||||
|
|
|
@ -5,7 +5,6 @@ DEST=/opt/stack
|
||||||
LOGFILE=$DEST/logs/stack.sh.log
|
LOGFILE=$DEST/logs/stack.sh.log
|
||||||
VERBOSE=True
|
VERBOSE=True
|
||||||
LOG_COLOR=False
|
LOG_COLOR=False
|
||||||
SCREEN_LOGDIR=$DEST/logs/screen
|
|
||||||
|
|
||||||
# Credentials
|
# Credentials
|
||||||
ADMIN_PASSWORD=mysecret
|
ADMIN_PASSWORD=mysecret
|
||||||
|
|
|
@ -8,7 +8,6 @@ SERVICE_TOKEN=abc123
|
||||||
|
|
||||||
LOG_COLOR=False
|
LOG_COLOR=False
|
||||||
DEST=/opt/stack/new
|
DEST=/opt/stack/new
|
||||||
SCREEN_LOGDIR=$DEST/logs/screen
|
|
||||||
LOGFILE=$DEST/logs/stack.sh.log
|
LOGFILE=$DEST/logs/stack.sh.log
|
||||||
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
||||||
|
|
||||||
|
|
|
@ -65,7 +65,6 @@ enable_service orchestrator,proxy,proxy_agent,base_configurator,q-lbaasv2-agent
|
||||||
|
|
||||||
LOG_COLOR=False
|
LOG_COLOR=False
|
||||||
DEST=/opt/stack/new
|
DEST=/opt/stack/new
|
||||||
SCREEN_LOGDIR=$DEST/logs/screen
|
|
||||||
LOGFILE=$DEST/logs/stack.sh.log
|
LOGFILE=$DEST/logs/stack.sh.log
|
||||||
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,6 @@ ENABLED_SERVICES+=,heat,h-api,h-api-cfn,h-api-cw,h-eng
|
||||||
|
|
||||||
LOG_COLOR=False
|
LOG_COLOR=False
|
||||||
DEST=/opt/stack/new
|
DEST=/opt/stack/new
|
||||||
SCREEN_LOGDIR=$DEST/logs/screen
|
|
||||||
LOGFILE=$DEST/logs/stack.sh.log
|
LOGFILE=$DEST/logs/stack.sh.log
|
||||||
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
SKIP_EXERCISES=volumes,trove,swift,sahara,euca,bundle,boot_from_volume,aggregates,zaqar,client-env,client-args,sec_groups,neutron-adv-test,floating_ips,horizon
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue