Added option disable validation via a certifying authority
When using SSL in connections to the registry server, do not require validation via a certifying authority. This is the registry's equivalent of specifying --insecure on the command line using Openstack clients for the API. Change-Id: Id8164ccc5c8eee6e2da179c7552a667e10e61215
This commit is contained in:
Artem Yasakov
@@ -3,10 +3,11 @@ usage: shaker-agent [-h] [--agent-id AGENT_ID] [--config-dir DIR]
|
||||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--log-format FORMAT] [--nodebug]
|
||||
[--nouse-syslog] [--nouse-syslog-rfc-format] [--noverbose]
|
||||
[--polling-interval POLLING_INTERVAL]
|
||||
[--nowatch-log-file] [--polling-interval POLLING_INTERVAL]
|
||||
[--server-endpoint SERVER_ENDPOINT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog]
|
||||
[--use-syslog-rfc-format] [--verbose] [--version]
|
||||
[--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
@@ -26,41 +27,59 @@ optional arguments:
|
||||
The name of a logging configuration file. This file is
|
||||
appended to any existing logging configuration files.
|
||||
For details about logging configuration files, see the
|
||||
Python logging module documentation.
|
||||
Python logging module documentation. Note that when
|
||||
logging configuration files are used then all logging
|
||||
configuration is set in the configuration file and
|
||||
other logging configuration options are ignored (for
|
||||
example, log_format).
|
||||
--log-date-format DATE_FORMAT
|
||||
Format string for %(asctime)s in log records. Default:
|
||||
None .
|
||||
None . This option is ignored if log_config_append is
|
||||
set.
|
||||
--log-dir LOG_DIR, --logdir LOG_DIR
|
||||
(Optional) The base directory used for relative --log-
|
||||
file paths.
|
||||
file paths. This option is ignored if
|
||||
log_config_append is set.
|
||||
--log-file PATH, --logfile PATH
|
||||
(Optional) Name of log file to output to. If no
|
||||
default is set, logging will go to stdout.
|
||||
default is set, logging will go to stdout. This option
|
||||
is ignored if log_config_append is set.
|
||||
--log-format FORMAT DEPRECATED. A logging.Formatter log message format
|
||||
string which may use any of the available
|
||||
logging.LogRecord attributes. This option is
|
||||
deprecated. Please use logging_context_format_string
|
||||
and logging_default_format_string instead.
|
||||
and logging_default_format_string instead. This option
|
||||
is ignored if log_config_append is set.
|
||||
--nodebug The inverse of --debug
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--nouse-syslog-rfc-format
|
||||
The inverse of --use-syslog-rfc-format
|
||||
--noverbose The inverse of --verbose
|
||||
--nowatch-log-file The inverse of --watch-log-file
|
||||
--polling-interval POLLING_INTERVAL
|
||||
How frequently the agent polls server, in seconds
|
||||
--server-endpoint SERVER_ENDPOINT
|
||||
Address for server connections (host:port), defaults
|
||||
to env[SHAKER_SERVER_ENDPOINT].
|
||||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines.
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-syslog Use syslog for logging. Existing syslog format is
|
||||
DEPRECATED and will be changed later to honor RFC5424.
|
||||
This option is ignored if log_config_append is set.
|
||||
--use-syslog-rfc-format
|
||||
(Optional) Enables or disables syslog rfc5424 format
|
||||
for logging. If enabled, prefixes the MSG part of the
|
||||
syslog message with APP-NAME (RFC5424). The format
|
||||
without the APP-NAME is deprecated in K, and will be
|
||||
removed in M, along with this option.
|
||||
without the APP-NAME is deprecated in Kilo, and will
|
||||
be removed in Mitaka, along with this option. This
|
||||
option is ignored if log_config_append is set.
|
||||
--verbose, -v If set to false, will disable INFO logging level,
|
||||
making WARNING the default.
|
||||
--version show program's version number and exit
|
||||
--watch-log-file (Optional) Uses logging handler designed to watch file
|
||||
system. When log file is moved or removed this handler
|
||||
will open a new log file with specified path
|
||||
instantaneously. It makes sense only if log-file
|
||||
option is specified and Linux platform is used. This
|
||||
option is ignored if log_config_append is set.
|
||||
|
||||
@@ -6,16 +6,17 @@ usage: shaker-cleanup [-h] [--cleanup-on-error] [--config-dir DIR]
|
||||
[--image-name IMAGE_NAME] [--log-config-append PATH]
|
||||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--log-format FORMAT]
|
||||
[--nocleanup-on-error] [--nodebug] [--nouse-syslog]
|
||||
[--nouse-syslog-rfc-format] [--noverbose]
|
||||
[--nocleanup-on-error] [--nodebug] [--noos-insecure]
|
||||
[--nouse-syslog] [--nouse-syslog-rfc-format]
|
||||
[--noverbose] [--nowatch-log-file]
|
||||
[--os-auth-url <auth-url>] [--os-cacert <auth-cacert>]
|
||||
[--os-password <auth-password>]
|
||||
[--os-insecure] [--os-password <auth-password>]
|
||||
[--os-region-name <auth-region-name>]
|
||||
[--os-tenant-name <auth-tenant-name>]
|
||||
[--os-username <auth-username>]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-syslog] [--use-syslog-rfc-format] [--verbose]
|
||||
[--version]
|
||||
[--version] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
@@ -50,32 +51,45 @@ optional arguments:
|
||||
The name of a logging configuration file. This file is
|
||||
appended to any existing logging configuration files.
|
||||
For details about logging configuration files, see the
|
||||
Python logging module documentation.
|
||||
Python logging module documentation. Note that when
|
||||
logging configuration files are used then all logging
|
||||
configuration is set in the configuration file and
|
||||
other logging configuration options are ignored (for
|
||||
example, log_format).
|
||||
--log-date-format DATE_FORMAT
|
||||
Format string for %(asctime)s in log records. Default:
|
||||
None .
|
||||
None . This option is ignored if log_config_append is
|
||||
set.
|
||||
--log-dir LOG_DIR, --logdir LOG_DIR
|
||||
(Optional) The base directory used for relative --log-
|
||||
file paths.
|
||||
file paths. This option is ignored if
|
||||
log_config_append is set.
|
||||
--log-file PATH, --logfile PATH
|
||||
(Optional) Name of log file to output to. If no
|
||||
default is set, logging will go to stdout.
|
||||
default is set, logging will go to stdout. This option
|
||||
is ignored if log_config_append is set.
|
||||
--log-format FORMAT DEPRECATED. A logging.Formatter log message format
|
||||
string which may use any of the available
|
||||
logging.LogRecord attributes. This option is
|
||||
deprecated. Please use logging_context_format_string
|
||||
and logging_default_format_string instead.
|
||||
and logging_default_format_string instead. This option
|
||||
is ignored if log_config_append is set.
|
||||
--nocleanup-on-error The inverse of --cleanup-on-error
|
||||
--nodebug The inverse of --debug
|
||||
--noos-insecure The inverse of --os-insecure
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--nouse-syslog-rfc-format
|
||||
The inverse of --use-syslog-rfc-format
|
||||
--noverbose The inverse of --verbose
|
||||
--nowatch-log-file The inverse of --watch-log-file
|
||||
--os-auth-url <auth-url>
|
||||
Authentication URL, defaults to env[OS_AUTH_URL].
|
||||
--os-cacert <auth-cacert>
|
||||
Location of CA Certificate, defaults to
|
||||
env[OS_CACERT].
|
||||
--os-insecure When using SSL in connections to the registry server,
|
||||
do not require validation via a certifying authority,
|
||||
defaults to env[OS_INSECURE].
|
||||
--os-password <auth-password>
|
||||
Authentication password, defaults to env[OS_PASSWORD].
|
||||
--os-region-name <auth-region-name>
|
||||
@@ -87,15 +101,24 @@ optional arguments:
|
||||
--os-username <auth-username>
|
||||
Authentication username, defaults to env[OS_USERNAME].
|
||||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines.
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-syslog Use syslog for logging. Existing syslog format is
|
||||
DEPRECATED and will be changed later to honor RFC5424.
|
||||
This option is ignored if log_config_append is set.
|
||||
--use-syslog-rfc-format
|
||||
(Optional) Enables or disables syslog rfc5424 format
|
||||
for logging. If enabled, prefixes the MSG part of the
|
||||
syslog message with APP-NAME (RFC5424). The format
|
||||
without the APP-NAME is deprecated in K, and will be
|
||||
removed in M, along with this option.
|
||||
without the APP-NAME is deprecated in Kilo, and will
|
||||
be removed in Mitaka, along with this option. This
|
||||
option is ignored if log_config_append is set.
|
||||
--verbose, -v If set to false, will disable INFO logging level,
|
||||
making WARNING the default.
|
||||
--version show program's version number and exit
|
||||
--watch-log-file (Optional) Uses logging handler designed to watch file
|
||||
system. When log file is moved or removed this handler
|
||||
will open a new log file with specified path
|
||||
instantaneously. It makes sense only if log-file
|
||||
option is specified and Linux platform is used. This
|
||||
option is ignored if log_config_append is set.
|
||||
|
||||
@@ -8,17 +8,17 @@ usage: shaker-image-builder [-h] [--cleanup-on-error] [--config-dir DIR]
|
||||
[--log-date-format DATE_FORMAT]
|
||||
[--log-dir LOG_DIR] [--log-file PATH]
|
||||
[--log-format FORMAT] [--nocleanup-on-error]
|
||||
[--nodebug] [--nouse-syslog]
|
||||
[--nodebug] [--noos-insecure] [--nouse-syslog]
|
||||
[--nouse-syslog-rfc-format] [--noverbose]
|
||||
[--os-auth-url <auth-url>]
|
||||
[--os-cacert <auth-cacert>]
|
||||
[--nowatch-log-file] [--os-auth-url <auth-url>]
|
||||
[--os-cacert <auth-cacert>] [--os-insecure]
|
||||
[--os-password <auth-password>]
|
||||
[--os-region-name <auth-region-name>]
|
||||
[--os-tenant-name <auth-tenant-name>]
|
||||
[--os-username <auth-username>]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-syslog] [--use-syslog-rfc-format]
|
||||
[--verbose] [--version]
|
||||
[--verbose] [--version] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
@@ -53,32 +53,45 @@ optional arguments:
|
||||
The name of a logging configuration file. This file is
|
||||
appended to any existing logging configuration files.
|
||||
For details about logging configuration files, see the
|
||||
Python logging module documentation.
|
||||
Python logging module documentation. Note that when
|
||||
logging configuration files are used then all logging
|
||||
configuration is set in the configuration file and
|
||||
other logging configuration options are ignored (for
|
||||
example, log_format).
|
||||
--log-date-format DATE_FORMAT
|
||||
Format string for %(asctime)s in log records. Default:
|
||||
None .
|
||||
None . This option is ignored if log_config_append is
|
||||
set.
|
||||
--log-dir LOG_DIR, --logdir LOG_DIR
|
||||
(Optional) The base directory used for relative --log-
|
||||
file paths.
|
||||
file paths. This option is ignored if
|
||||
log_config_append is set.
|
||||
--log-file PATH, --logfile PATH
|
||||
(Optional) Name of log file to output to. If no
|
||||
default is set, logging will go to stdout.
|
||||
default is set, logging will go to stdout. This option
|
||||
is ignored if log_config_append is set.
|
||||
--log-format FORMAT DEPRECATED. A logging.Formatter log message format
|
||||
string which may use any of the available
|
||||
logging.LogRecord attributes. This option is
|
||||
deprecated. Please use logging_context_format_string
|
||||
and logging_default_format_string instead.
|
||||
and logging_default_format_string instead. This option
|
||||
is ignored if log_config_append is set.
|
||||
--nocleanup-on-error The inverse of --cleanup-on-error
|
||||
--nodebug The inverse of --debug
|
||||
--noos-insecure The inverse of --os-insecure
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--nouse-syslog-rfc-format
|
||||
The inverse of --use-syslog-rfc-format
|
||||
--noverbose The inverse of --verbose
|
||||
--nowatch-log-file The inverse of --watch-log-file
|
||||
--os-auth-url <auth-url>
|
||||
Authentication URL, defaults to env[OS_AUTH_URL].
|
||||
--os-cacert <auth-cacert>
|
||||
Location of CA Certificate, defaults to
|
||||
env[OS_CACERT].
|
||||
--os-insecure When using SSL in connections to the registry server,
|
||||
do not require validation via a certifying authority,
|
||||
defaults to env[OS_INSECURE].
|
||||
--os-password <auth-password>
|
||||
Authentication password, defaults to env[OS_PASSWORD].
|
||||
--os-region-name <auth-region-name>
|
||||
@@ -90,15 +103,24 @@ optional arguments:
|
||||
--os-username <auth-username>
|
||||
Authentication username, defaults to env[OS_USERNAME].
|
||||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines.
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-syslog Use syslog for logging. Existing syslog format is
|
||||
DEPRECATED and will be changed later to honor RFC5424.
|
||||
This option is ignored if log_config_append is set.
|
||||
--use-syslog-rfc-format
|
||||
(Optional) Enables or disables syslog rfc5424 format
|
||||
for logging. If enabled, prefixes the MSG part of the
|
||||
syslog message with APP-NAME (RFC5424). The format
|
||||
without the APP-NAME is deprecated in K, and will be
|
||||
removed in M, along with this option.
|
||||
without the APP-NAME is deprecated in Kilo, and will
|
||||
be removed in Mitaka, along with this option. This
|
||||
option is ignored if log_config_append is set.
|
||||
--verbose, -v If set to false, will disable INFO logging level,
|
||||
making WARNING the default.
|
||||
--version show program's version number and exit
|
||||
--watch-log-file (Optional) Uses logging handler designed to watch file
|
||||
system. When log file is moved or removed this handler
|
||||
will open a new log file with specified path
|
||||
instantaneously. It makes sense only if log-file
|
||||
option is specified and Linux platform is used. This
|
||||
option is ignored if log_config_append is set.
|
||||
|
||||
@@ -3,11 +3,11 @@ usage: shaker-report [-h] [--config-dir DIR] [--config-file PATH] [--debug]
|
||||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--log-format FORMAT] [--nodebug]
|
||||
[--nouse-syslog] [--nouse-syslog-rfc-format]
|
||||
[--noverbose] [--report REPORT]
|
||||
[--noverbose] [--nowatch-log-file] [--report REPORT]
|
||||
[--report-template REPORT_TEMPLATE] [--subunit SUBUNIT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-syslog] [--use-syslog-rfc-format] [--verbose]
|
||||
[--version]
|
||||
[--version] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
@@ -28,26 +28,35 @@ optional arguments:
|
||||
The name of a logging configuration file. This file is
|
||||
appended to any existing logging configuration files.
|
||||
For details about logging configuration files, see the
|
||||
Python logging module documentation.
|
||||
Python logging module documentation. Note that when
|
||||
logging configuration files are used then all logging
|
||||
configuration is set in the configuration file and
|
||||
other logging configuration options are ignored (for
|
||||
example, log_format).
|
||||
--log-date-format DATE_FORMAT
|
||||
Format string for %(asctime)s in log records. Default:
|
||||
None .
|
||||
None . This option is ignored if log_config_append is
|
||||
set.
|
||||
--log-dir LOG_DIR, --logdir LOG_DIR
|
||||
(Optional) The base directory used for relative --log-
|
||||
file paths.
|
||||
file paths. This option is ignored if
|
||||
log_config_append is set.
|
||||
--log-file PATH, --logfile PATH
|
||||
(Optional) Name of log file to output to. If no
|
||||
default is set, logging will go to stdout.
|
||||
default is set, logging will go to stdout. This option
|
||||
is ignored if log_config_append is set.
|
||||
--log-format FORMAT DEPRECATED. A logging.Formatter log message format
|
||||
string which may use any of the available
|
||||
logging.LogRecord attributes. This option is
|
||||
deprecated. Please use logging_context_format_string
|
||||
and logging_default_format_string instead.
|
||||
and logging_default_format_string instead. This option
|
||||
is ignored if log_config_append is set.
|
||||
--nodebug The inverse of --debug
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--nouse-syslog-rfc-format
|
||||
The inverse of --use-syslog-rfc-format
|
||||
--noverbose The inverse of --verbose
|
||||
--nowatch-log-file The inverse of --watch-log-file
|
||||
--report REPORT Report file name, defaults to env[SHAKER_REPORT].
|
||||
--report-template REPORT_TEMPLATE
|
||||
Template for report. Can be a file name or one of
|
||||
@@ -56,15 +65,24 @@ optional arguments:
|
||||
--subunit SUBUNIT Subunit stream file name, defaults to
|
||||
env[SHAKER_SUBUNIT].
|
||||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines.
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-syslog Use syslog for logging. Existing syslog format is
|
||||
DEPRECATED and will be changed later to honor RFC5424.
|
||||
This option is ignored if log_config_append is set.
|
||||
--use-syslog-rfc-format
|
||||
(Optional) Enables or disables syslog rfc5424 format
|
||||
for logging. If enabled, prefixes the MSG part of the
|
||||
syslog message with APP-NAME (RFC5424). The format
|
||||
without the APP-NAME is deprecated in K, and will be
|
||||
removed in M, along with this option.
|
||||
without the APP-NAME is deprecated in Kilo, and will
|
||||
be removed in Mitaka, along with this option. This
|
||||
option is ignored if log_config_append is set.
|
||||
--verbose, -v If set to false, will disable INFO logging level,
|
||||
making WARNING the default.
|
||||
--version show program's version number and exit
|
||||
--watch-log-file (Optional) Uses logging handler designed to watch file
|
||||
system. When log file is moved or removed this handler
|
||||
will open a new log file with specified path
|
||||
instantaneously. It makes sense only if log-file
|
||||
option is specified and Linux platform is used. This
|
||||
option is ignored if log_config_append is set.
|
||||
|
||||
@@ -6,8 +6,9 @@ usage: shaker [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
|
||||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--log-format FORMAT] [--no-report-on-error]
|
||||
[--nocleanup-on-error] [--nodebug] [--nono-report-on-error]
|
||||
[--nouse-syslog] [--nouse-syslog-rfc-format] [--noverbose]
|
||||
[--os-auth-url <auth-url>] [--os-cacert <auth-cacert>]
|
||||
[--noos-insecure] [--nouse-syslog] [--nouse-syslog-rfc-format]
|
||||
[--noverbose] [--nowatch-log-file] [--os-auth-url <auth-url>]
|
||||
[--os-cacert <auth-cacert>] [--os-insecure]
|
||||
[--os-password <auth-password>]
|
||||
[--os-region-name <auth-region-name>]
|
||||
[--os-tenant-name <auth-tenant-name>]
|
||||
@@ -17,6 +18,7 @@ usage: shaker [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
|
||||
[--server-endpoint SERVER_ENDPOINT] [--subunit SUBUNIT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog]
|
||||
[--use-syslog-rfc-format] [--verbose] [--version]
|
||||
[--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
@@ -53,35 +55,48 @@ optional arguments:
|
||||
The name of a logging configuration file. This file is
|
||||
appended to any existing logging configuration files.
|
||||
For details about logging configuration files, see the
|
||||
Python logging module documentation.
|
||||
Python logging module documentation. Note that when
|
||||
logging configuration files are used then all logging
|
||||
configuration is set in the configuration file and
|
||||
other logging configuration options are ignored (for
|
||||
example, log_format).
|
||||
--log-date-format DATE_FORMAT
|
||||
Format string for %(asctime)s in log records. Default:
|
||||
None .
|
||||
None . This option is ignored if log_config_append is
|
||||
set.
|
||||
--log-dir LOG_DIR, --logdir LOG_DIR
|
||||
(Optional) The base directory used for relative --log-
|
||||
file paths.
|
||||
file paths. This option is ignored if
|
||||
log_config_append is set.
|
||||
--log-file PATH, --logfile PATH
|
||||
(Optional) Name of log file to output to. If no
|
||||
default is set, logging will go to stdout.
|
||||
default is set, logging will go to stdout. This option
|
||||
is ignored if log_config_append is set.
|
||||
--log-format FORMAT DEPRECATED. A logging.Formatter log message format
|
||||
string which may use any of the available
|
||||
logging.LogRecord attributes. This option is
|
||||
deprecated. Please use logging_context_format_string
|
||||
and logging_default_format_string instead.
|
||||
and logging_default_format_string instead. This option
|
||||
is ignored if log_config_append is set.
|
||||
--no-report-on-error Do not generate report for failed scenarios
|
||||
--nocleanup-on-error The inverse of --cleanup-on-error
|
||||
--nodebug The inverse of --debug
|
||||
--nono-report-on-error
|
||||
The inverse of --no-report-on-error
|
||||
--noos-insecure The inverse of --os-insecure
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--nouse-syslog-rfc-format
|
||||
The inverse of --use-syslog-rfc-format
|
||||
--noverbose The inverse of --verbose
|
||||
--nowatch-log-file The inverse of --watch-log-file
|
||||
--os-auth-url <auth-url>
|
||||
Authentication URL, defaults to env[OS_AUTH_URL].
|
||||
--os-cacert <auth-cacert>
|
||||
Location of CA Certificate, defaults to
|
||||
env[OS_CACERT].
|
||||
--os-insecure When using SSL in connections to the registry server,
|
||||
do not require validation via a certifying authority,
|
||||
defaults to env[OS_INSECURE].
|
||||
--os-password <auth-password>
|
||||
Authentication password, defaults to env[OS_PASSWORD].
|
||||
--os-region-name <auth-region-name>
|
||||
@@ -104,7 +119,16 @@ optional arguments:
|
||||
--scenario SCENARIO Scenario to play. Can be a file name or one of
|
||||
aliases: "misc/instance_metadata",
|
||||
"misc/static_agent", "misc/static_agents_pair",
|
||||
"networking/cross_az/full_l2", "networking/dense_l2",
|
||||
"networking/cross_az/full_l2",
|
||||
"networking/cross_az/full_l3_east_west",
|
||||
"networking/cross_az/full_l3_north_south",
|
||||
"networking/cross_az/perf_l2",
|
||||
"networking/cross_az/perf_l3_east_west",
|
||||
"networking/cross_az/perf_l3_north_south",
|
||||
"networking/cross_az/udp_full_l2",
|
||||
"networking/cross_az/udp_l2",
|
||||
"networking/cross_az/udp_l3_east_west",
|
||||
"networking/dense_l2",
|
||||
"networking/dense_l3_east_west",
|
||||
"networking/dense_l3_north_south",
|
||||
"networking/full_l2", "networking/full_l3_east_west",
|
||||
@@ -120,15 +144,24 @@ optional arguments:
|
||||
--subunit SUBUNIT Subunit stream file name, defaults to
|
||||
env[SHAKER_SUBUNIT].
|
||||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines.
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-syslog Use syslog for logging. Existing syslog format is
|
||||
DEPRECATED and will be changed later to honor RFC5424.
|
||||
This option is ignored if log_config_append is set.
|
||||
--use-syslog-rfc-format
|
||||
(Optional) Enables or disables syslog rfc5424 format
|
||||
for logging. If enabled, prefixes the MSG part of the
|
||||
syslog message with APP-NAME (RFC5424). The format
|
||||
without the APP-NAME is deprecated in K, and will be
|
||||
removed in M, along with this option.
|
||||
without the APP-NAME is deprecated in Kilo, and will
|
||||
be removed in Mitaka, along with this option. This
|
||||
option is ignored if log_config_append is set.
|
||||
--verbose, -v If set to false, will disable INFO logging level,
|
||||
making WARNING the default.
|
||||
--version show program's version number and exit
|
||||
--watch-log-file (Optional) Uses logging handler designed to watch file
|
||||
system. When log file is moved or removed this handler
|
||||
will open a new log file with specified path
|
||||
instantaneously. It makes sense only if log-file
|
||||
option is specified and Linux platform is used. This
|
||||
option is ignored if log_config_append is set.
|
||||
|
||||
@@ -16,46 +16,61 @@
|
||||
|
||||
# The name of a logging configuration file. This file is appended to any
|
||||
# existing logging configuration files. For details about logging configuration
|
||||
# files, see the Python logging module documentation. (string value)
|
||||
# files, see the Python logging module documentation. Note that when logging
|
||||
# configuration files are used then all logging configuration is set in the
|
||||
# configuration file and other logging configuration options are ignored (for
|
||||
# example, log_format). (string value)
|
||||
# Deprecated group/name - [DEFAULT]/log_config
|
||||
#log_config_append = <None>
|
||||
|
||||
# DEPRECATED. A logging.Formatter log message format string which may use any
|
||||
# of the available logging.LogRecord attributes. This option is deprecated.
|
||||
# Please use logging_context_format_string and logging_default_format_string
|
||||
# instead. (string value)
|
||||
# instead. This option is ignored if log_config_append is set. (string value)
|
||||
#log_format = <None>
|
||||
|
||||
# Format string for %%(asctime)s in log records. Default: %(default)s . (string
|
||||
# value)
|
||||
# Format string for %%(asctime)s in log records. Default: %(default)s . This
|
||||
# option is ignored if log_config_append is set. (string value)
|
||||
#log_date_format = %Y-%m-%d %H:%M:%S
|
||||
|
||||
# (Optional) Name of log file to output to. If no default is set, logging will
|
||||
# go to stdout. (string value)
|
||||
# go to stdout. This option is ignored if log_config_append is set. (string
|
||||
# value)
|
||||
# Deprecated group/name - [DEFAULT]/logfile
|
||||
#log_file = <None>
|
||||
|
||||
# (Optional) The base directory used for relative --log-file paths. (string
|
||||
# value)
|
||||
# (Optional) The base directory used for relative --log-file paths. This option
|
||||
# is ignored if log_config_append is set. (string value)
|
||||
# Deprecated group/name - [DEFAULT]/logdir
|
||||
#log_dir = <None>
|
||||
|
||||
# (Optional) Uses logging handler designed to watch file system. When log file
|
||||
# is moved or removed this handler will open a new log file with specified path
|
||||
# instantaneously. It makes sense only if log-file option is specified and
|
||||
# Linux platform is used. This option is ignored if log_config_append is set.
|
||||
# (boolean value)
|
||||
#watch_log_file = false
|
||||
|
||||
# Use syslog for logging. Existing syslog format is DEPRECATED and will be
|
||||
# changed later to honor RFC5424. (boolean value)
|
||||
# changed later to honor RFC5424. This option is ignored if log_config_append
|
||||
# is set. (boolean value)
|
||||
#use_syslog = false
|
||||
|
||||
# (Optional) Enables or disables syslog rfc5424 format for logging. If enabled,
|
||||
# prefixes the MSG part of the syslog message with APP-NAME (RFC5424). The
|
||||
# format without the APP-NAME is deprecated in K, and will be removed in M,
|
||||
# along with this option. (boolean value)
|
||||
# format without the APP-NAME is deprecated in Kilo, and will be removed in
|
||||
# Mitaka, along with this option. This option is ignored if log_config_append
|
||||
# is set. (boolean value)
|
||||
# This option is deprecated for removal.
|
||||
# Its value may be silently ignored in the future.
|
||||
#use_syslog_rfc_format = true
|
||||
|
||||
# Syslog facility to receive log lines. (string value)
|
||||
# Syslog facility to receive log lines. This option is ignored if
|
||||
# log_config_append is set. (string value)
|
||||
#syslog_log_facility = LOG_USER
|
||||
|
||||
# Log output to standard error. (boolean value)
|
||||
# Log output to standard error. This option is ignored if log_config_append is
|
||||
# set. (boolean value)
|
||||
#use_stderr = true
|
||||
|
||||
# Format string to use for log messages with context. (string value)
|
||||
@@ -70,7 +85,8 @@
|
||||
# Prefix each line of exception output with this format. (string value)
|
||||
#logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d ERROR %(name)s %(instance)s
|
||||
|
||||
# List of logger=LEVEL pairs. (list value)
|
||||
# List of logger=LEVEL pairs. This option is ignored if log_config_append is
|
||||
# set. (list value)
|
||||
#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,requests.packages.urllib3.util.retry=WARN,urllib3.util.retry=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN,taskflow=WARN
|
||||
|
||||
# Enables or disables publication of error events. (boolean value)
|
||||
@@ -84,6 +100,10 @@
|
||||
# value)
|
||||
#instance_uuid_format = "[instance: %(uuid)s] "
|
||||
|
||||
# Format string for user_identity field of the logging_context_format_string
|
||||
# (string value)
|
||||
#logging_user_identity_format = %(user)s %(tenant)s %(domain)s %(user_domain)s %(project_domain)s
|
||||
|
||||
# Enables or disables fatal status of deprecations. (boolean value)
|
||||
#fatal_deprecations = false
|
||||
|
||||
@@ -92,7 +112,7 @@
|
||||
#
|
||||
|
||||
# Address for server connections (host:port), defaults to
|
||||
# env[SHAKER_SERVER_ENDPOINT]. (unknown type)
|
||||
# env[SHAKER_SERVER_ENDPOINT]. (string value)
|
||||
#server_endpoint = <None>
|
||||
|
||||
# How frequently the agent polls server, in seconds (integer value)
|
||||
@@ -113,6 +133,11 @@
|
||||
# Location of CA Certificate, defaults to env[OS_CACERT]. (string value)
|
||||
#os_cacert =
|
||||
|
||||
# When using SSL in connections to the registry server, do not require
|
||||
# validation via a certifying authority, defaults to env[OS_INSECURE]. (boolean
|
||||
# value)
|
||||
#os_insecure = false
|
||||
|
||||
# Authentication region name, defaults to env[OS_REGION_NAME]. (string value)
|
||||
#os_region_name = RegionOne
|
||||
|
||||
@@ -135,14 +160,18 @@
|
||||
|
||||
# Scenario to play. Can be a file name or one of aliases:
|
||||
# "misc/instance_metadata", "misc/static_agent", "misc/static_agents_pair",
|
||||
# "networking/cross_az/full_l2", "networking/dense_l2",
|
||||
# "networking/dense_l3_east_west", "networking/dense_l3_north_south",
|
||||
# "networking/full_l2", "networking/full_l3_east_west",
|
||||
# "networking/full_l3_north_south", "networking/perf_l2",
|
||||
# "networking/perf_l3_east_west", "networking/perf_l3_north_south",
|
||||
# "networking/udp_l2", "networking/udp_l3_east_west",
|
||||
# "networking/udp_l3_north_south". Defaults to env[SHAKER_SCENARIO]. (string
|
||||
# value)
|
||||
# "networking/cross_az/full_l2", "networking/cross_az/full_l3_east_west",
|
||||
# "networking/cross_az/full_l3_north_south", "networking/cross_az/perf_l2",
|
||||
# "networking/cross_az/perf_l3_east_west",
|
||||
# "networking/cross_az/perf_l3_north_south", "networking/cross_az/udp_full_l2",
|
||||
# "networking/cross_az/udp_l2", "networking/cross_az/udp_l3_east_west",
|
||||
# "networking/dense_l2", "networking/dense_l3_east_west",
|
||||
# "networking/dense_l3_north_south", "networking/full_l2",
|
||||
# "networking/full_l3_east_west", "networking/full_l3_north_south",
|
||||
# "networking/perf_l2", "networking/perf_l3_east_west",
|
||||
# "networking/perf_l3_north_south", "networking/udp_l2",
|
||||
# "networking/udp_l3_east_west", "networking/udp_l3_north_south". Defaults to
|
||||
# env[SHAKER_SCENARIO]. (string value)
|
||||
#scenario = <None>
|
||||
|
||||
# File for output in JSON format, defaults to env[SHAKER_OUTPUT]. (string
|
||||
|
||||
@@ -73,6 +73,11 @@ OPENSTACK_OPTS = [
|
||||
default=utils.env('OS_CACERT'),
|
||||
sample_default='',
|
||||
help='Location of CA Certificate, defaults to env[OS_CACERT].'),
|
||||
cfg.BoolOpt('os-insecure',
|
||||
default=(utils.env('OS_INSECURE') or False),
|
||||
help='When using SSL in connections to the registry server, '
|
||||
'do not require validation via a certifying authority, '
|
||||
'defaults to env[OS_INSECURE].'),
|
||||
cfg.StrOpt('os-region-name', metavar='<auth-region-name>',
|
||||
default=utils.env('OS_REGION_NAME') or 'RegionOne',
|
||||
help='Authentication region name, defaults to '
|
||||
|
||||
@@ -170,13 +170,13 @@ class Deployment(object):
|
||||
|
||||
def connect_to_openstack(self, os_username, os_password, os_tenant_name,
|
||||
os_auth_url, os_region_name, external_net,
|
||||
flavor_name, image_name, os_cacert):
|
||||
flavor_name, image_name, os_cacert, os_insecure):
|
||||
LOG.debug('Connecting to OpenStack')
|
||||
|
||||
self.openstack_client = openstack.OpenStackClient(
|
||||
username=os_username, password=os_password,
|
||||
tenant_name=os_tenant_name, auth_url=os_auth_url,
|
||||
region_name=os_region_name, cacert=os_cacert)
|
||||
region_name=os_region_name, cacert=os_cacert, insecure=os_insecure)
|
||||
|
||||
self.flavor_name = flavor_name
|
||||
self.image_name = image_name
|
||||
|
||||
@@ -39,12 +39,14 @@ def init():
|
||||
openstack_client = openstack.OpenStackClient(
|
||||
username=cfg.CONF.os_username, password=cfg.CONF.os_password,
|
||||
tenant_name=cfg.CONF.os_tenant_name, auth_url=cfg.CONF.os_auth_url,
|
||||
region_name=cfg.CONF.os_region_name, cacert=cfg.CONF.os_cacert)
|
||||
region_name=cfg.CONF.os_region_name, cacert=cfg.CONF.os_cacert,
|
||||
insecure=cfg.CONF.os_insecure
|
||||
)
|
||||
except Exception as e:
|
||||
LOG.error('Error establishing connection to OpenStack: %s. '
|
||||
'Please verify OpenStack credentials (--os-username, '
|
||||
'--os-password, --os-tenant-name, --os-auth-url, '
|
||||
'--os-cacert)', e)
|
||||
'--os-cacert, --os-insecure)', e)
|
||||
exit(1)
|
||||
|
||||
return openstack_client
|
||||
|
||||
@@ -122,7 +122,7 @@ def play_scenario(scenario):
|
||||
cfg.CONF.os_tenant_name, cfg.CONF.os_auth_url,
|
||||
cfg.CONF.os_region_name, cfg.CONF.external_net,
|
||||
cfg.CONF.flavor_name, cfg.CONF.image_name,
|
||||
cfg.CONF.os_cacert)
|
||||
cfg.CONF.os_cacert, cfg.CONF.os_insecure)
|
||||
|
||||
base_dir = os.path.dirname(scenario['file_name'])
|
||||
agents = deployment.deploy(scenario['deployment'], base_dir=base_dir)
|
||||
|
||||
@@ -19,13 +19,14 @@ from glanceclient import client as glance_client_pkg
|
||||
GLANCE_VERSION = '1'
|
||||
|
||||
|
||||
def create_client(keystone_client, os_region_name, cacert):
|
||||
def create_client(keystone_client, os_region_name, cacert, insecure):
|
||||
image_api_url = keystone_client.service_catalog.url_for(
|
||||
service_type='image', region_name=os_region_name)
|
||||
return glance_client_pkg.Client(GLANCE_VERSION,
|
||||
endpoint=image_api_url,
|
||||
token=keystone_client.auth_token,
|
||||
cacert=cacert)
|
||||
cacert=cacert,
|
||||
insecure=insecure)
|
||||
|
||||
|
||||
def get_image(glance_client, image_name):
|
||||
|
||||
@@ -25,13 +25,14 @@ LOG = logging.getLogger(__name__)
|
||||
HEAT_VERSION = '1'
|
||||
|
||||
|
||||
def create_client(keystone_client, os_region_name, cacert):
|
||||
def create_client(keystone_client, os_region_name, cacert, insecure):
|
||||
orchestration_api_url = keystone_client.service_catalog.url_for(
|
||||
service_type='orchestration', region_name=os_region_name)
|
||||
return heat_client_pkg.Client(HEAT_VERSION,
|
||||
endpoint=orchestration_api_url,
|
||||
token=keystone_client.auth_token,
|
||||
ca_file=cacert)
|
||||
ca_file=cacert,
|
||||
insecure=insecure)
|
||||
|
||||
|
||||
def create_stack(heat_client, stack_name, template, parameters):
|
||||
|
||||
@@ -32,6 +32,6 @@ def create_keystone_client(**kwargs):
|
||||
'Failed to discover keystone version for url %(auth_url)s.', **kwargs)
|
||||
|
||||
|
||||
def create_keystone_session(cacert, **kwargs):
|
||||
def create_keystone_session(cacert, insecure, **kwargs):
|
||||
auth = auth_v2.Password(**kwargs)
|
||||
return session.Session(auth=auth, verify=cacert)
|
||||
return session.Session(auth=auth, cert=cacert, verify=not insecure)
|
||||
|
||||
@@ -62,18 +62,21 @@ class OpenStackClientProxy(object):
|
||||
|
||||
class OpenStackClient(object):
|
||||
def __init__(self, username, password, tenant_name, auth_url, region_name,
|
||||
cacert):
|
||||
cacert, insecure):
|
||||
self.region_name = region_name or 'RegionOne'
|
||||
self.cacert = cacert or ''
|
||||
self.insecure = insecure or False
|
||||
self._osc_cache = {}
|
||||
self.keystone_creator = functools.partial(
|
||||
keystone.create_keystone_client,
|
||||
username=username, password=password,
|
||||
tenant_name=tenant_name, auth_url=auth_url, cacert=cacert)
|
||||
tenant_name=tenant_name, auth_url=auth_url, cacert=cacert,
|
||||
insecure=insecure)
|
||||
self.session_creator = functools.partial(
|
||||
keystone.create_keystone_session, cacert,
|
||||
username=username, password=password,
|
||||
tenant_name=tenant_name, auth_url=auth_url)
|
||||
tenant_name=tenant_name, auth_url=auth_url,
|
||||
insecure=insecure)
|
||||
# ping OpenStack
|
||||
self.keystone_creator()
|
||||
|
||||
@@ -88,7 +91,7 @@ class OpenStackClient(object):
|
||||
elif name in OLD_CLIENT_MAKERS:
|
||||
client_creator = functools.partial(
|
||||
OLD_CLIENT_MAKERS[name], os_region_name=self.region_name,
|
||||
cacert=self.cacert)
|
||||
cacert=self.cacert, insecure=self.insecure)
|
||||
client = OpenStackClientProxy(self.keystone_creator,
|
||||
client_creator)
|
||||
|
||||
|
||||
@@ -180,7 +180,7 @@ class TestServerPlayScenario(testtools.TestCase):
|
||||
self.deployment, base_dir='folder')
|
||||
deploy_obj.connect_to_openstack.assert_called_once_with(
|
||||
'user', 'password', 'tenant', 'auth-url', 'RegionOne', None,
|
||||
'shaker-flavor', 'shaker-image', None
|
||||
'shaker-flavor', 'shaker-image', None, False
|
||||
)
|
||||
deploy_obj.cleanup.assert_called_once_with()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user