openstack
/
kayobe
Code Issues Proposed changes

Make kolla-openstack molecule test pass

This commit is contained in:
Mark Goddard 2018-02-08 11:58:28 +00:00
parent 8f53f3252e
commit 07ef585ca5
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ansible/roles/kolla-openstack/defaults/main.yml
View File

@ -3,7 +3,7 @@
kolla_extra_config_path:
# Directory where Kolla custom configuration files will be installed.
kolla_node_custom_config_path:
kolla_node_custom_config_path: /etc/kolla/config
###############################################################################
# ceph configuration.
@ -60,6 +60,12 @@ kolla_enable_heat:
# Free form extra configuration to append to heat.conf.
kolla_extra_heat:
###############################################################################
# Horizon configuration.
# Whether to enable Horizon.
kolla_enable_horizon:
###############################################################################
# Ironic configuration.
@ -246,6 +252,12 @@ kolla_enable_magnum:
# Free form extra configuration to append to magnum.conf.
kolla_extra_magnum:
###############################################################################
# Manila configuration.
# Whether to enable Manila.
kolla_enable_manila:
###############################################################################
# Monasca configuration.

2
ansible/roles/kolla-openstack/vars/main.yml
View File

@ -13,7 +13,7 @@ kolla_openstack_custom_config:
- src: "{{ kolla_extra_config_path }}/ceph"
dest: "{{ kolla_node_custom_config_path }}/ceph"
patterns: "*"
enabled: "{{ kolla_enable_ceph }}"
enabled: "{{ kolla_enable_ceph }}"
# Cinder.
- src: "{{ kolla_extra_config_path }}/cinder"
dest: "{{ kolla_node_custom_config_path }}/cinder"