openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Add ability to specify undercloud install command"

Browse Source
This commit is contained in:
Zuul 2018-10-06 21:20:47 +00:00 committed by Gerrit Code Review
commit dacd4706ae
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/undercloud-deploy/README.md
View File

@ -39,6 +39,7 @@ user sessions to provide greater flexixiblity to our users. ** additional docume
https://docs.openstack.org/tripleo-quickstart/latest/accessing-libvirt.html
- `undercloud_conf_extra`: <''> -- extra options to be added to ~/undercloud.conf
- `undercloud_extra_args`: <''> -- extra options for undercloud deploy command.
- `undercloud_install_cmd`: <'openstack undercloud install'> -- command used to install the undercloud
- `undercloud_install_cli_options`: <''> -- extra options for undercloud install command.
- `undercloud_enable_mistral`: <'true'> -- sets up the 'enable_mistral' option
in undercloud.conf.

1
roles/undercloud-deploy/defaults/main.yml
View File

@ -1,6 +1,7 @@
---
undercloud_config_file: undercloud.conf.j2
undercloud_install_cmd: openstack undercloud install
undercloud_install_cli_options: ""
undercloud_post_install_script: undercloud-install-post.sh.j2
undercloud_install_log: "{{ working_dir }}/undercloud_install.log"

2
roles/undercloud-deploy/templates/undercloud-install.sh.j2
View File

@ -11,6 +11,6 @@ set -eux
export {{ var }}
{% endfor %}
openstack undercloud install {{ undercloud_install_cli_options }}
{{ undercloud_install_cmd }} {{ undercloud_install_cli_options }}
### --stop_docs