Add support for CentOS7 through diskimage-builder
This commit adds image builder support for CentOS by generalizing the image_elements using package-installs.yaml ad pkg-map. A few other executables have been modified to ensure compatibility. Ubuntu is kept as default. Change-Id: I4122155d82ad64867efdb6d88536624f677c207d
This commit is contained in:
parent
667a1fa6e0
commit
9f1b65464a
|
@ -1,18 +1,18 @@
|
|||
usage: shaker-agent [-h] [--agent-id AGENT_ID] [--config-dir DIR]
|
||||
[--config-file PATH] [--debug] [--log-config-append PATH]
|
||||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--nodebug] [--nouse-syslog]
|
||||
[--noverbose] [--nowatch-log-file]
|
||||
[--log-file PATH] [--nodebug] [--nouse-journal]
|
||||
[--nouse-syslog] [--nowatch-log-file]
|
||||
[--polling-interval POLLING_INTERVAL]
|
||||
[--server-endpoint SERVER_ENDPOINT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog]
|
||||
[--verbose] [--watch-log-file]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-journal] [--use-syslog] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--agent-id AGENT_ID Agent unique id, defaults to MAC of primary interface.
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
--config-dir DIR Path to a config directory to pull `*.conf` files
|
||||
from. This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s)
|
||||
specified via previous --config-file, arguments hence
|
||||
|
@ -22,7 +22,7 @@ optional arguments:
|
|||
precedence. Defaults to None.
|
||||
--debug, -d If set to true, the logging level will be set to DEBUG
|
||||
instead of the default INFO level.
|
||||
--log-config-append PATH, --log_config PATH
|
||||
--log-config-append PATH, --log-config PATH, --log_config PATH
|
||||
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
|
||||
|
@ -45,8 +45,8 @@ optional arguments:
|
|||
defined by use_stderr. This option is ignored if
|
||||
log_config_append is set.
|
||||
--nodebug The inverse of --debug
|
||||
--nouse-journal The inverse of --use-journal
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--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
|
||||
|
@ -56,11 +56,15 @@ optional arguments:
|
|||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-journal Enable journald for logging. If running in a systemd
|
||||
environment you may wish to enable journal support.
|
||||
Doing so will use the journal native protocol which
|
||||
includes structured metadata in addition to log
|
||||
messages.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.
|
||||
--verbose, -v If set to false, the logging level will be set to
|
||||
WARNING instead of the default INFO level.
|
||||
--watch-log-file 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
|
||||
|
|
|
@ -8,6 +8,7 @@ usage: shaker-all-in-one [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
|
|||
[--flavor-disk FLAVOR_DISK]
|
||||
[--flavor-name FLAVOR_NAME] [--flavor-ram FLAVOR_RAM]
|
||||
[--flavor-vcpus FLAVOR_VCPUS]
|
||||
[--image-builder-distro IMAGE_BUILDER_DISTRO]
|
||||
[--image-builder-mode IMAGE_BUILDER_MODE]
|
||||
[--image-builder-template IMAGE_BUILDER_TEMPLATE]
|
||||
[--image-name IMAGE_NAME] [--log-config-append PATH]
|
||||
|
@ -16,8 +17,8 @@ usage: shaker-all-in-one [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
|
|||
[--no-report-on-error] [--nocleanup]
|
||||
[--nocleanup-on-error] [--nodebug]
|
||||
[--nono-report-on-error] [--noos-insecure]
|
||||
[--nouse-syslog] [--noverbose] [--nowatch-log-file]
|
||||
[--os-auth-url <auth-url>]
|
||||
[--nouse-journal] [--nouse-syslog]
|
||||
[--nowatch-log-file] [--os-auth-url <auth-url>]
|
||||
[--os-cacert <auth-cacert>] [--os-insecure]
|
||||
[--os-password <auth-password>]
|
||||
[--os-project-name <auth-project-name>]
|
||||
|
@ -30,7 +31,7 @@ usage: shaker-all-in-one [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
|
|||
[--server-endpoint SERVER_ENDPOINT]
|
||||
[--subunit SUBUNIT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-syslog] [--verbose] [--watch-log-file]
|
||||
[--use-journal] [--use-syslog] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
|
@ -51,8 +52,8 @@ optional arguments:
|
|||
--cleanup Cleanup the image and the flavor.
|
||||
--cleanup-on-error Clean up the heat-stack upon any error occurred during
|
||||
scenario execution.
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
--config-dir DIR Path to a config directory to pull `*.conf` files
|
||||
from. This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s)
|
||||
specified via previous --config-file, arguments hence
|
||||
|
@ -82,6 +83,9 @@ optional arguments:
|
|||
--flavor-vcpus FLAVOR_VCPUS
|
||||
Number of cores to allocate for Shaker image, defaults
|
||||
to env[SHAKER_FLAVOR_VCPUS]
|
||||
--image-builder-distro IMAGE_BUILDER_DISTRO
|
||||
Operating System Distribution for shaker image when
|
||||
using diskimage-builder, defaults to ubuntu
|
||||
--image-builder-mode IMAGE_BUILDER_MODE
|
||||
Image building mode: "heat" - using Heat template
|
||||
(requires Glance v1 for base image upload); "dib" -
|
||||
|
@ -96,7 +100,7 @@ optional arguments:
|
|||
--image-name IMAGE_NAME
|
||||
Name of image to use. The default is created by
|
||||
shaker-image-builder.
|
||||
--log-config-append PATH, --log_config PATH
|
||||
--log-config-append PATH, --log-config PATH, --log_config PATH
|
||||
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
|
||||
|
@ -131,8 +135,8 @@ optional arguments:
|
|||
--nono-report-on-error
|
||||
The inverse of --no-report-on-error
|
||||
--noos-insecure The inverse of --os-insecure
|
||||
--nouse-journal The inverse of --use-journal
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--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].
|
||||
|
@ -204,11 +208,15 @@ optional arguments:
|
|||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-journal Enable journald for logging. If running in a systemd
|
||||
environment you may wish to enable journal support.
|
||||
Doing so will use the journal native protocol which
|
||||
includes structured metadata in addition to log
|
||||
messages.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.
|
||||
--verbose, -v If set to false, the logging level will be set to
|
||||
WARNING instead of the default INFO level.
|
||||
--watch-log-file 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
|
||||
|
|
|
@ -6,8 +6,8 @@ usage: shaker-cleanup [-h] [--cleanup] [--cleanup-on-error] [--config-dir DIR]
|
|||
[--log-config-append PATH]
|
||||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--nocleanup] [--nocleanup-on-error]
|
||||
[--nodebug] [--noos-insecure] [--nouse-syslog]
|
||||
[--noverbose] [--nowatch-log-file]
|
||||
[--nodebug] [--noos-insecure] [--nouse-journal]
|
||||
[--nouse-syslog] [--nowatch-log-file]
|
||||
[--os-auth-url <auth-url>] [--os-cacert <auth-cacert>]
|
||||
[--os-insecure] [--os-password <auth-password>]
|
||||
[--os-project-name <auth-project-name>]
|
||||
|
@ -15,15 +15,15 @@ usage: shaker-cleanup [-h] [--cleanup] [--cleanup-on-error] [--config-dir DIR]
|
|||
[--os-tenant-name <auth-tenant-name>]
|
||||
[--os-username <auth-username>]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-syslog] [--verbose] [--watch-log-file]
|
||||
[--use-journal] [--use-syslog] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--cleanup Cleanup the image and the flavor.
|
||||
--cleanup-on-error Clean up the heat-stack upon any error occurred during
|
||||
scenario execution.
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
--config-dir DIR Path to a config directory to pull `*.conf` files
|
||||
from. This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s)
|
||||
specified via previous --config-file, arguments hence
|
||||
|
@ -47,7 +47,7 @@ optional arguments:
|
|||
--image-name IMAGE_NAME
|
||||
Name of image to use. The default is created by
|
||||
shaker-image-builder.
|
||||
--log-config-append PATH, --log_config PATH
|
||||
--log-config-append PATH, --log-config PATH, --log_config PATH
|
||||
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
|
||||
|
@ -73,8 +73,8 @@ optional arguments:
|
|||
--nocleanup-on-error The inverse of --cleanup-on-error
|
||||
--nodebug The inverse of --debug
|
||||
--noos-insecure The inverse of --os-insecure
|
||||
--nouse-journal The inverse of --use-journal
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--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].
|
||||
|
@ -101,11 +101,15 @@ optional arguments:
|
|||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-journal Enable journald for logging. If running in a systemd
|
||||
environment you may wish to enable journal support.
|
||||
Doing so will use the journal native protocol which
|
||||
includes structured metadata in addition to log
|
||||
messages.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.
|
||||
--verbose, -v If set to false, the logging level will be set to
|
||||
WARNING instead of the default INFO level.
|
||||
--watch-log-file 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
|
||||
|
|
|
@ -6,6 +6,7 @@ usage: shaker-image-builder [-h] [--cleanup-on-error] [--config-dir DIR]
|
|||
[--flavor-name FLAVOR_NAME]
|
||||
[--flavor-ram FLAVOR_RAM]
|
||||
[--flavor-vcpus FLAVOR_VCPUS]
|
||||
[--image-builder-distro IMAGE_BUILDER_DISTRO]
|
||||
[--image-builder-mode IMAGE_BUILDER_MODE]
|
||||
[--image-builder-template IMAGE_BUILDER_TEMPLATE]
|
||||
[--image-name IMAGE_NAME]
|
||||
|
@ -13,8 +14,9 @@ usage: shaker-image-builder [-h] [--cleanup-on-error] [--config-dir DIR]
|
|||
[--log-date-format DATE_FORMAT]
|
||||
[--log-dir LOG_DIR] [--log-file PATH]
|
||||
[--nocleanup-on-error] [--nodebug]
|
||||
[--noos-insecure] [--nouse-syslog] [--noverbose]
|
||||
[--nowatch-log-file] [--os-auth-url <auth-url>]
|
||||
[--noos-insecure] [--nouse-journal]
|
||||
[--nouse-syslog] [--nowatch-log-file]
|
||||
[--os-auth-url <auth-url>]
|
||||
[--os-cacert <auth-cacert>] [--os-insecure]
|
||||
[--os-password <auth-password>]
|
||||
[--os-project-name <auth-project-name>]
|
||||
|
@ -22,14 +24,14 @@ usage: shaker-image-builder [-h] [--cleanup-on-error] [--config-dir DIR]
|
|||
[--os-tenant-name <auth-tenant-name>]
|
||||
[--os-username <auth-username>]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-syslog] [--verbose] [--watch-log-file]
|
||||
[--use-journal] [--use-syslog] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--cleanup-on-error Clean up the heat-stack upon any error occurred during
|
||||
scenario execution.
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
--config-dir DIR Path to a config directory to pull `*.conf` files
|
||||
from. This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s)
|
||||
specified via previous --config-file, arguments hence
|
||||
|
@ -59,6 +61,9 @@ optional arguments:
|
|||
--flavor-vcpus FLAVOR_VCPUS
|
||||
Number of cores to allocate for Shaker image, defaults
|
||||
to env[SHAKER_FLAVOR_VCPUS]
|
||||
--image-builder-distro IMAGE_BUILDER_DISTRO
|
||||
Operating System Distribution for shaker image when
|
||||
using diskimage-builder, defaults to ubuntu
|
||||
--image-builder-mode IMAGE_BUILDER_MODE
|
||||
Image building mode: "heat" - using Heat template
|
||||
(requires Glance v1 for base image upload); "dib" -
|
||||
|
@ -73,7 +78,7 @@ optional arguments:
|
|||
--image-name IMAGE_NAME
|
||||
Name of image to use. The default is created by
|
||||
shaker-image-builder.
|
||||
--log-config-append PATH, --log_config PATH
|
||||
--log-config-append PATH, --log-config PATH, --log_config PATH
|
||||
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
|
||||
|
@ -98,8 +103,8 @@ optional arguments:
|
|||
--nocleanup-on-error The inverse of --cleanup-on-error
|
||||
--nodebug The inverse of --debug
|
||||
--noos-insecure The inverse of --os-insecure
|
||||
--nouse-journal The inverse of --use-journal
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--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].
|
||||
|
@ -126,11 +131,15 @@ optional arguments:
|
|||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-journal Enable journald for logging. If running in a systemd
|
||||
environment you may wish to enable journal support.
|
||||
Doing so will use the journal native protocol which
|
||||
includes structured metadata in addition to log
|
||||
messages.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.
|
||||
--verbose, -v If set to false, the logging level will be set to
|
||||
WARNING instead of the default INFO level.
|
||||
--watch-log-file 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
|
||||
|
|
|
@ -2,18 +2,18 @@ usage: shaker-report [-h] [--book BOOK] [--config-dir DIR]
|
|||
[--config-file PATH] [--debug] [--input INPUT]
|
||||
[--log-config-append PATH]
|
||||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--nodebug] [--nouse-syslog]
|
||||
[--noverbose] [--nowatch-log-file] [--report REPORT]
|
||||
[--log-file PATH] [--nodebug] [--nouse-journal]
|
||||
[--nouse-syslog] [--nowatch-log-file] [--report REPORT]
|
||||
[--report-template REPORT_TEMPLATE] [--subunit SUBUNIT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--use-syslog] [--verbose] [--watch-log-file]
|
||||
[--use-journal] [--use-syslog] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
--book BOOK Generate report in ReST format and store it into the
|
||||
specified folder, defaults to env[SHAKER_BOOK].
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
--config-dir DIR Path to a config directory to pull `*.conf` files
|
||||
from. This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s)
|
||||
specified via previous --config-file, arguments hence
|
||||
|
@ -25,7 +25,7 @@ optional arguments:
|
|||
instead of the default INFO level.
|
||||
--input INPUT File or list of files to read test results from,
|
||||
defaults to env[SHAKER_INPUT].
|
||||
--log-config-append PATH, --log_config PATH
|
||||
--log-config-append PATH, --log-config PATH, --log_config PATH
|
||||
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
|
||||
|
@ -48,8 +48,8 @@ optional arguments:
|
|||
defined by use_stderr. This option is ignored if
|
||||
log_config_append is set.
|
||||
--nodebug The inverse of --debug
|
||||
--nouse-journal The inverse of --use-journal
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--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
|
||||
|
@ -61,11 +61,15 @@ optional arguments:
|
|||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-journal Enable journald for logging. If running in a systemd
|
||||
environment you may wish to enable journal support.
|
||||
Doing so will use the journal native protocol which
|
||||
includes structured metadata in addition to log
|
||||
messages.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.
|
||||
--verbose, -v If set to false, the logging level will be set to
|
||||
WARNING instead of the default INFO level.
|
||||
--watch-log-file 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
|
||||
|
|
|
@ -3,12 +3,12 @@ usage: shaker-spot [-h] [--artifacts-dir ARTIFACTS_DIR] [--book BOOK]
|
|||
[--log-config-append PATH] [--log-date-format DATE_FORMAT]
|
||||
[--log-dir LOG_DIR] [--log-file PATH] [--matrix MATRIX]
|
||||
[--no-report-on-error] [--nodebug] [--nono-report-on-error]
|
||||
[--nouse-syslog] [--noverbose] [--nowatch-log-file]
|
||||
[--nouse-journal] [--nouse-syslog] [--nowatch-log-file]
|
||||
[--output OUTPUT] [--report REPORT]
|
||||
[--report-template REPORT_TEMPLATE] [--scenario SCENARIO]
|
||||
[--subunit SUBUNIT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog]
|
||||
[--verbose] [--watch-log-file]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-journal]
|
||||
[--use-syslog] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
|
@ -18,8 +18,8 @@ optional arguments:
|
|||
to env[SHAKER_ARTIFACTS_DIR].
|
||||
--book BOOK Generate report in ReST format and store it into the
|
||||
specified folder, defaults to env[SHAKER_BOOK].
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
--config-dir DIR Path to a config directory to pull `*.conf` files
|
||||
from. This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s)
|
||||
specified via previous --config-file, arguments hence
|
||||
|
@ -29,7 +29,7 @@ optional arguments:
|
|||
precedence. Defaults to None.
|
||||
--debug, -d If set to true, the logging level will be set to DEBUG
|
||||
instead of the default INFO level.
|
||||
--log-config-append PATH, --log_config PATH
|
||||
--log-config-append PATH, --log-config PATH, --log_config PATH
|
||||
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
|
||||
|
@ -61,8 +61,8 @@ optional arguments:
|
|||
--nodebug The inverse of --debug
|
||||
--nono-report-on-error
|
||||
The inverse of --no-report-on-error
|
||||
--nouse-journal The inverse of --use-journal
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--noverbose The inverse of --verbose
|
||||
--nowatch-log-file The inverse of --watch-log-file
|
||||
--output OUTPUT File for output in JSON format, defaults to
|
||||
env[SHAKER_OUTPUT]. If it is empty, then output will
|
||||
|
@ -107,11 +107,15 @@ optional arguments:
|
|||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-journal Enable journald for logging. If running in a systemd
|
||||
environment you may wish to enable journal support.
|
||||
Doing so will use the journal native protocol which
|
||||
includes structured metadata in addition to log
|
||||
messages.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.
|
||||
--verbose, -v If set to false, the logging level will be set to
|
||||
WARNING instead of the default INFO level.
|
||||
--watch-log-file 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
|
||||
|
|
|
@ -8,7 +8,7 @@ usage: shaker [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
|
|||
[--log-date-format DATE_FORMAT] [--log-dir LOG_DIR]
|
||||
[--log-file PATH] [--matrix MATRIX] [--no-report-on-error]
|
||||
[--nocleanup-on-error] [--nodebug] [--nono-report-on-error]
|
||||
[--noos-insecure] [--nouse-syslog] [--noverbose]
|
||||
[--noos-insecure] [--nouse-journal] [--nouse-syslog]
|
||||
[--nowatch-log-file] [--os-auth-url <auth-url>]
|
||||
[--os-cacert <auth-cacert>] [--os-insecure]
|
||||
[--os-password <auth-password>]
|
||||
|
@ -19,8 +19,8 @@ usage: shaker [-h] [--agent-join-timeout AGENT_JOIN_TIMEOUT]
|
|||
[--polling-interval POLLING_INTERVAL] [--report REPORT]
|
||||
[--report-template REPORT_TEMPLATE] [--scenario SCENARIO]
|
||||
[--server-endpoint SERVER_ENDPOINT] [--subunit SUBUNIT]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-syslog]
|
||||
[--verbose] [--watch-log-file]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY] [--use-journal]
|
||||
[--use-syslog] [--watch-log-file]
|
||||
|
||||
optional arguments:
|
||||
-h, --help show this help message and exit
|
||||
|
@ -40,8 +40,8 @@ optional arguments:
|
|||
specified folder, defaults to env[SHAKER_BOOK].
|
||||
--cleanup-on-error Clean up the heat-stack upon any error occurred during
|
||||
scenario execution.
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
--config-dir DIR Path to a config directory to pull `*.conf` files
|
||||
from. This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s)
|
||||
specified via previous --config-file, arguments hence
|
||||
|
@ -65,7 +65,7 @@ optional arguments:
|
|||
--image-name IMAGE_NAME
|
||||
Name of image to use. The default is created by
|
||||
shaker-image-builder.
|
||||
--log-config-append PATH, --log_config PATH
|
||||
--log-config-append PATH, --log-config PATH, --log_config PATH
|
||||
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
|
||||
|
@ -99,8 +99,8 @@ optional arguments:
|
|||
--nono-report-on-error
|
||||
The inverse of --no-report-on-error
|
||||
--noos-insecure The inverse of --os-insecure
|
||||
--nouse-journal The inverse of --use-journal
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--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].
|
||||
|
@ -172,11 +172,15 @@ optional arguments:
|
|||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
Syslog facility to receive log lines. This option is
|
||||
ignored if log_config_append is set.
|
||||
--use-journal Enable journald for logging. If running in a systemd
|
||||
environment you may wish to enable journal support.
|
||||
Doing so will use the journal native protocol which
|
||||
includes structured metadata in addition to log
|
||||
messages.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.
|
||||
--verbose, -v If set to false, the logging level will be set to
|
||||
WARNING instead of the default INFO level.
|
||||
--watch-log-file 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
|
||||
|
|
|
@ -9,12 +9,6 @@
|
|||
# Note: This option can be changed without restarting.
|
||||
#debug = false
|
||||
|
||||
# DEPRECATED: If set to false, the logging level will be set to WARNING instead
|
||||
# of the default INFO level. (boolean value)
|
||||
# This option is deprecated for removal.
|
||||
# Its value may be silently ignored in the future.
|
||||
#verbose = true
|
||||
|
||||
# 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. Note that when logging
|
||||
|
@ -53,6 +47,12 @@
|
|||
# is set. (boolean value)
|
||||
#use_syslog = false
|
||||
|
||||
# Enable journald for logging. If running in a systemd environment you may wish
|
||||
# to enable journal support. Doing so will use the journal native protocol
|
||||
# which includes structured metadata in addition to log messages.This option is
|
||||
# ignored if log_config_append is set. (boolean value)
|
||||
#use_journal = false
|
||||
|
||||
# Syslog facility to receive log lines. This option is ignored if
|
||||
# log_config_append is set. (string value)
|
||||
#syslog_log_facility = LOG_USER
|
||||
|
@ -81,7 +81,7 @@
|
|||
|
||||
# List of package logging levels in 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,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO
|
||||
#default_log_levels = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=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,keystoneauth=WARN,oslo.cache=INFO,dogpile.core.dogpile=INFO
|
||||
|
||||
# Enables or disables publication of error events. (boolean value)
|
||||
#publish_errors = false
|
||||
|
@ -267,5 +267,10 @@
|
|||
# Allowed values: heat, dib
|
||||
#image_builder_mode = <None>
|
||||
|
||||
# Operating System Distribution for shaker image when using diskimage-builder,
|
||||
# defaults to ubuntu (string value)
|
||||
# Allowed values: ubuntu, centos7
|
||||
#image_builder_distro = ubuntu
|
||||
|
||||
# Cleanup the image and the flavor. (boolean value)
|
||||
#cleanup = true
|
||||
|
|
|
@ -257,6 +257,12 @@ IMAGE_BUILDER_OPTS = [
|
|||
'(requires qemu-utils and debootstrap). If not set, '
|
||||
'switches to "dib" if Glance v1 is not available. '
|
||||
'Can be specified as env[SHAKER_IMAGE_BUILDER_MODE]'),
|
||||
cfg.StrOpt('image-builder-distro',
|
||||
default=(utils.env('SHAKER_IMAGE_BUILDER_DISTRO') or
|
||||
'ubuntu'),
|
||||
choices=['ubuntu', 'centos7'],
|
||||
help='Operating System Distribution for shaker image '
|
||||
'when using diskimage-builder, defaults to ubuntu'),
|
||||
]
|
||||
|
||||
CLEANUP_OPTS = [
|
||||
|
|
|
@ -131,7 +131,8 @@ def build_image_with_dib(openstack_client, image_name):
|
|||
temp_dir = tempfile.mkdtemp()
|
||||
os.chdir(temp_dir)
|
||||
filename = os.path.join(temp_dir, 'shaker-image.qcow2')
|
||||
command = 'disk-image-create -o %s ubuntu vm shaker' % filename
|
||||
command = 'disk-image-create -o %s %s vm shaker' % (
|
||||
filename, cfg.CONF.image_builder_distro)
|
||||
|
||||
# path: local python binaries (including virtualenv) + sys.path + $PATH
|
||||
sys_path = ([sys.exec_prefix, os.path.join(sys.exec_prefix, 'bin')] +
|
||||
|
|
|
@ -4,3 +4,4 @@ package-installs
|
|||
source-repositories
|
||||
pip-and-virtualenv
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
set -o pipefail
|
||||
|
||||
if [[ ${DISTRO_NAME} =~ "centos" ]]; then
|
||||
yum install -y epel-release
|
||||
yum install -y gcc
|
||||
else
|
||||
if [[ ${DISTRO_NAME} =~ "ubuntu" ]]; then
|
||||
apt-get install -y build-essential
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -3,6 +3,5 @@
|
|||
set -eux
|
||||
set -o pipefail
|
||||
|
||||
install-packages build-essential g++ python-dev libzmq-dev
|
||||
|
||||
pip install pyshaker
|
||||
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
g++:
|
||||
screen:
|
||||
libzmq-dev:
|
||||
python-dev:
|
||||
wget:
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"family": {
|
||||
"redhat": {
|
||||
"g++": "gcc-c++",
|
||||
"screen": "screen",
|
||||
"libzmq-dev": "zeromq-devel",
|
||||
"pyhton-dev": "python-devel",
|
||||
"wget": "wget"
|
||||
},
|
||||
"debian": {
|
||||
"g++": "g++",
|
||||
"screen": "screen",
|
||||
"libzmq-dev": "libzmq-dev",
|
||||
"python-dev": "python-dev",
|
||||
"wget": "wget"
|
||||
}
|
||||
},
|
||||
"default": {
|
||||
"g++": "g++",
|
||||
"screen": "screen",
|
||||
"libzmq-dev": "libzmq-dev",
|
||||
"python-dev": "python-dev",
|
||||
"wget": "wget"
|
||||
|
||||
}
|
||||
}
|
|
@ -3,5 +3,16 @@
|
|||
set -eux
|
||||
set -o pipefail
|
||||
|
||||
install-packages netperf
|
||||
|
||||
if [[ ${DISTRO_NAME} =~ "centos" ]]; then
|
||||
wget https://github.com/HewlettPackard/netperf/archive/netperf-2.7.0.tar.gz
|
||||
tar xvzf netperf-2.7.0.tar.gz
|
||||
pushd netperf-netperf-2.7.0
|
||||
./configure --enable-demo=yes
|
||||
make
|
||||
make install
|
||||
popd
|
||||
else
|
||||
if [[ ${DISTRO_NAME} =~ "ubuntu" ]]; then
|
||||
install-packages netperf
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -0,0 +1,18 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -eux
|
||||
set -o pipefail
|
||||
if [[ ${DISTRO_NAME} =~ "centos" ]]; then
|
||||
cat<<'EOF' >> /etc/systemd/system/netperf.service
|
||||
[Unit]
|
||||
Description="Netperf netserver daemon"
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/local/bin/netserver -D
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
systemctl enable netperf
|
||||
fi
|
||||
|
Loading…
Reference in New Issue