openstack/kayobe
Code Issues Proposed changes

Support KAYOBE_BASE_PATH in kayobe python module

Browse Source 
This allows us to infer the kolla-ansible virtualenv as
$KAYOBE_BASE_PATH/venvs/kolla when $KOLLA_VENV isn't set.

Further work on the distinction between local and remote paths is still required.
This commit is contained in:
Mark Goddard 2017-09-01 15:04:38 +00:00
parent 316d16c0ec
commit 00b6d7e7f0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kayobe/kolla_ansible.py
View File

@ -25,7 +25,11 @@ DEFAULT_CONFIG_PATH = "/etc/kolla"
CONFIG_PATH_ENV = "KOLLA_CONFIG_PATH" CONFIG_PATH_ENV = "KOLLA_CONFIG_PATH"
DEFAULT_VENV_PATH = "/opt/kayobe/venvs/kolla" DEFAULT_BASE_PATH = "/opt/kayobe"
BASE_PATH_ENV = "KAYOBE_BASE_PATH"
DEFAULT_VENV_PATH = "venvs/kolla"
VENV_PATH_ENV = "KOLLA_VENV" VENV_PATH_ENV = "KOLLA_VENV"
@ -35,7 +39,10 @@ LOG = logging.getLogger(__name__)
def add_args(parser): def add_args(parser):
"""Add arguments required for running Kolla Ansible to a parser.""" """Add arguments required for running Kolla Ansible to a parser."""
default_config_path = os.getenv(CONFIG_PATH_ENV, DEFAULT_CONFIG_PATH) default_config_path = os.getenv(CONFIG_PATH_ENV, DEFAULT_CONFIG_PATH)
default_venv = os.getenv(VENV_PATH_ENV, DEFAULT_VENV_PATH) default_venv = os.getenv(VENV_PATH_ENV,
os.path.join(os.getenv(BASE_PATH_ENV,
DEFAULT_BASE_PATH),
DEFAULT_VENV_PATH))
parser.add_argument("--kolla-config-path", default=default_config_path, parser.add_argument("--kolla-config-path", default=default_config_path,
help="path to Kolla configuration. " help="path to Kolla configuration. "
"(default=$%s or %s)" % "(default=$%s or %s)" %
@ -57,8 +64,9 @@ def add_args(parser):
"values in Kolla Ansible") "values in Kolla Ansible")
parser.add_argument("--kolla-venv", metavar="VENV", default=default_venv, parser.add_argument("--kolla-venv", metavar="VENV", default=default_venv,
help="path to virtualenv where Kolla Ansible is " help="path to virtualenv where Kolla Ansible is "
"installed (default=$%s or %s)" % "installed (default=$%s or $%s/%s, or %s/%s)" %
(VENV_PATH_ENV, DEFAULT_VENV_PATH)) (VENV_PATH_ENV, BASE_PATH_ENV, DEFAULT_VENV_PATH,
DEFAULT_BASE_PATH, DEFAULT_VENV_PATH))
def _get_inventory_path(parsed_args, inventory_filename): def _get_inventory_path(parsed_args, inventory_filename):