diff options
| -rw-r--r-- | docker/ansible.cfg.default | 2 | ||||
| -rw-r--r-- | docs/index.rst | 44 | ||||
| -rw-r--r-- | qtip/cli/commands/cmd_workspace.py | 14 | ||||
| -rw-r--r-- | resources/ansible_roles/qtip-workspace/create.yml | 26 |
4 files changed, 16 insertions, 70 deletions
diff --git a/docker/ansible.cfg.default b/docker/ansible.cfg.default deleted file mode 100644 index 0451870a..00000000 --- a/docker/ansible.cfg.default +++ /dev/null @@ -1,2 +0,0 @@ -[defaults] -callback_whitelist = profile_tasks diff --git a/docs/index.rst b/docs/index.rst index 69f2d951..17ed58d8 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -13,43 +13,7 @@ for performance, simple but supported by comprehensive testing data and transpar .. _QTIP: https://wiki.opnfv.org/display/qtip .. _OPNFV: https://www.opnfv.org/ - -Release Notes -============= - -.. toctree:: - :maxdepth: 2 - - release/release-notes/danube.rst - release/release-notes/brahmaputra.rst - -Installation -============ - -.. toctree:: - :maxdepth: 2 - - testing/user/configguide/configuration.rst - -User Guide -========== - -.. toctree:: - :maxdepth: 2 - - testing/user/userguide/overview.rst - testing/user/userguide/cli.rst - testing/user/userguide/api.rst - testing/user/userguide/compute.rst - -Developer Guide -=============== - -.. toctree:: - :maxdepth: 2 - - testing/developer/devguide/overview.rst - testing/developer/devguide/arch.rst - testing/developer/devguide/cli.rst - testing/developer/devguide/api.rst - testing/developer/devguide/compute-qpi.rst +.. include:: release/release-notes/index.rst +.. include:: testing/user/configguide/index.rst +.. include:: testing/user/userguide/index.rst +.. include:: testing/developer/devguide/index.rst diff --git a/qtip/cli/commands/cmd_workspace.py b/qtip/cli/commands/cmd_workspace.py index 9636f7fb..42d4e2d5 100644 --- a/qtip/cli/commands/cmd_workspace.py +++ b/qtip/cli/commands/cmd_workspace.py @@ -21,10 +21,20 @@ def cli(): @cli.command("create", help="Create QTIP workspace") -def create(): +@click.option('--pod', default='unknown', help='Name of pod under test') +@click.option('--installer', help='OPNFV installer') +@click.option('--master-host', help='Installer hostname') +@click.option('--scenario', default='unknown', help='OPNFV scenario') +@click.argument('name') +def create(pod, installer, master_host, scenario, name): extra_vars = { 'qtip_package': utils.QTIP_PACKAGE, - 'cwd': os.getcwd() + 'cwd': os.getcwd(), + 'pod_name': pod, + 'installer': installer, + 'scenario': scenario, + 'installer_master_host': master_host, + 'workspace': name } os.system("ANSIBLE_ROLES_PATH={qtip_package}/{roles_path} ansible-playbook" " {qtip_package}/{roles_path}/qtip-workspace/create.yml" diff --git a/resources/ansible_roles/qtip-workspace/create.yml b/resources/ansible_roles/qtip-workspace/create.yml index 66a8cf36..4b06ebfa 100644 --- a/resources/ansible_roles/qtip-workspace/create.yml +++ b/resources/ansible_roles/qtip-workspace/create.yml @@ -12,32 +12,6 @@ gather_facts: no - vars_prompt: - - - name: pod_name - prompt: 'name of the pod under test (used in reporting)' - default: qtip-pod - private: no - - - name: scenario - prompt: 'scenario deployed in the pod:' - default: default - private: no - - - name: installer - prompt: 'installer type of the pod (apex|fuel)' - default: fuel - private: no - - - name: installer_master_host - prompt: 'master host/vm of the installer (accessible by `ssh <hostname>`)' - private: no - - - name: workspace - prompt: 'workspace name (new directory will be created)' - default: workspace - private: no - roles: - role: qtip-workspace |