openstack/kayobe
Code Issues Proposed changes

Add minimal configuration of murano

Browse Source 
Supports image building and custom configuration of murano.conf.
This commit is contained in:
Mark Goddard
2017-07-11 18:52:06 +01:00
parent 158adefbb2
commit 6f21f506c8
5 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all/kolla
View File

@@ -106,6 +106,8 @@ controller_container_image_regex_map:
enabled: True enabled: True
- regex: magnum - regex: magnum
enabled: "{{ kolla_enable_magnum | bool }}" enabled: "{{ kolla_enable_magnum | bool }}"
- regex: murano
enabled: "{{ kolla_enable_murano | bool }}"
- regex: mariadb - regex: mariadb
enabled: True enabled: True
- regex: memcached - regex: memcached
@@ -171,6 +173,7 @@ kolla_enable_glance: "yes"
kolla_enable_ironic: "yes" kolla_enable_ironic: "yes"
kolla_enable_neutron: "yes" kolla_enable_neutron: "yes"
kolla_enable_magnum: "no" kolla_enable_magnum: "no"
kolla_enable_murano: "no"
kolla_enable_sahara: "no" kolla_enable_sahara: "no"
kolla_enable_swift: "yes" kolla_enable_swift: "yes"

2
ansible/kolla-openstack.yml
View File

@@ -19,6 +19,7 @@
- { name: ironic, file: ironic.conf } - { name: ironic, file: ironic.conf }
- { name: ironic_dnsmasq, file: ironic/ironic-dnsmasq.conf } - { name: ironic_dnsmasq, file: ironic/ironic-dnsmasq.conf }
- { name: magnum, file: magnum.conf } - { name: magnum, file: magnum.conf }
- { name: murano, file: murano.conf }
- { name: neutron, file: neutron.conf } - { name: neutron, file: neutron.conf }
- { name: neutron_ml2, file: neutron/ml2_conf.ini } - { name: neutron_ml2, file: neutron/ml2_conf.ini }
- { name: nova, file: nova.conf } - { name: nova, file: nova.conf }
@@ -94,6 +95,7 @@
kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}" kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"
kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | default }}" kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | default }}"
kolla_extra_magnum: "{{ kolla_extra_config.magnum | default }}" kolla_extra_magnum: "{{ kolla_extra_config.magnum | default }}"
kolla_extra_murano: "{{ kolla_extra_config.murano | default }}"
kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}" kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}"
kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}" kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}"
kolla_extra_nova: "{{ kolla_extra_config.nova | default }}" kolla_extra_nova: "{{ kolla_extra_config.nova | default }}"

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

@@ -177,6 +177,15 @@ kolla_enable_magnum:
# Free form extra configuration to append to magnum.conf. # Free form extra configuration to append to magnum.conf.
kolla_extra_magnum: kolla_extra_magnum:
###############################################################################
# Murano configuration.
# Whether to enable Murano.
kolla_enable_murano:
# Free form extra configuration to append to murano.conf.
kolla_extra_murano:
############################################################################### ###############################################################################
# Neutron configuration. # Neutron configuration.

1
ansible/roles/kolla-openstack/tasks/config.yml
View File

@@ -23,6 +23,7 @@
- { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" } - { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" }
- { src: magnum.conf.j2, dest: magnum.conf, enabled: "{{ kolla_enable_magnum }}" } - { src: magnum.conf.j2, dest: magnum.conf, enabled: "{{ kolla_enable_magnum }}" }
- { src: ml2_conf.ini.j2, dest: neutron/ml2_conf.ini, enabled: "{{ kolla_enable_neutron }}" } - { src: ml2_conf.ini.j2, dest: neutron/ml2_conf.ini, enabled: "{{ kolla_enable_neutron }}" }
- { src: murano.conf.j2, dest: murano.conf, enabled: "{{ kolla_enable_murano }}" }
- { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" } - { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" }
- { src: nova.conf.j2, dest: nova.conf, enabled: "{{ kolla_enable_nova }}" } - { src: nova.conf.j2, dest: nova.conf, enabled: "{{ kolla_enable_nova }}" }
- { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" } - { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" }

9
ansible/roles/kolla-openstack/templates/murano.conf.j2 Normal file
View File

@@ -0,0 +1,9 @@
# {{ ansible_managed }}
{% if kolla_extra_murano %}
#######################
# Extra configuration
#######################
{{ kolla_extra_murano }}
{% endif %}