openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Add arbitrary extra THT config to overcloud deploy 

* add config files through the extra_tht_configs variable
* README.md overhaul plus add the new variable to it

Depends-On: I2ff172d5ec1a46fba12c9ce13bb3f21500036185
Change-Id: I9c3a8e41fc322c4f4842dfc2e22c1f6b1fe89923
This commit is contained in:
Attila Darazs 2016-10-13 11:56:54 +02:00
parent f764c3ceb8
commit 39f2df66a6
2 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
README.md
View File

@ -1,38 +1,49 @@
Role Name
=========
ansible-role-tripleo-overcloud-prep-config
==========================================
An Ansible role to copy configuration files to the undercloud prior to deployment.
An Ansible role to copy configuration files to the undercloud prior to
overcloud deployment.
Requirements
------------
This playbook expects that the undercloud has been installed and setup using one of the roles relevant to baremetal overcloud deployments.
This playbook expects that the undercloud has been installed and setup using
one of the roles relevant to baremetal overcloud deployments.
Role Variables
--------------
**Note:** Make sure to include all environment file and options from your [initial Overcloud creation](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux_OpenStack_Platform/7/html/Director_Installation_and_Usage/sect-Scaling_the_Overcloud.html).
**Note:** Make sure to include all environment file and options from your
[initial Overcloud creation](https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux_OpenStack_Platform/7/html/Director_Installation_and_Usage/sect-Scaling_the_Overcloud.html).
- working_dir: <'/home/stack'> -- working directory for the role. Assumes stackrc file is present at this location
- baremetal_instackenv: <"{{ working_dir }}/instackenv.json"> -- location of instackenv.json to copy over
- baremetal_network_environment: <"{{ working_dir }}/network-isolation.yml"> -- location of network-environment file to copy over
- undercloud_type: <virtual> -- can be overwritten with values like 'baremetal' or 'ovb'
- `working_dir`: <'/home/stack'> -- working directory for the role. Assumes
stackrc file is present at this location
- `baremetal_instackenv`: <"{{ working_dir }}/instackenv.json"> -- location of
instackenv.json to copy over
- `baremetal_network_environment`: <"{{ working_dir }}/network-isolation.yml">
-- location of network-environment file to copy over
- `undercloud_type`: <virtual> -- can be overwritten with values like
'baremetal' or 'ovb'
- `extra_tht_configs`: -- a list of files to copy to the overcloud and add as
extra config to the overcloud-deployment command
Dependencies
------------
This playbook does not deploy the overcloud. After this playbook runs, call https://github.com/redhat-openstack/ansible-role-tripleo-overcloud.
This playbook does not deploy the overcloud. After this playbook runs, call
https://github.com/redhat-openstack/ansible-role-tripleo-overcloud.
Example Playbook
----------------
1. Sample playbook to call the role
Sample playbook to call the role
- name: Copy configuration files
hosts: virthost
gather_facts: no
roles:
- ansible-role-tripleo-overcloud-prep-config
```yaml
- name: Copy configuration files
hosts: undercloud
roles:
- ansible-role-tripleo-overcloud-prep-config
```
License
-------
@ -43,4 +54,3 @@ Author Information
------------------
RDO-CI Team

13
tasks/main.yml
View File

@ -43,4 +43,17 @@
{{ working_dir }}/overcloud-custom-tht-script.sh > \
{{ overcloud_custom_tht_log }} 2>&1
- name: Copy extra THT config files on the undercloud
copy:
src: "{{ item }}"
dest: "{{ working_dir }}"
with_items: "{{ extra_tht_configs }}"
when: extra_tht_configs is defined
- name: Add extra THT config file to the deploy command
set_fact:
extra_tht_config_args: >-
{{ extra_tht_config_args|default('') }}
-e {{ working_dir }}/{{ item | basename }}
with_items: "{{ extra_tht_configs }}"
when: extra_tht_configs is defined