diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 66c5e8b9f..fd2493fe5 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -106,6 +106,8 @@ controller_container_image_regex_map: enabled: True - regex: magnum enabled: "{{ kolla_enable_magnum | bool }}" + - regex: murano + enabled: "{{ kolla_enable_murano | bool }}" - regex: mariadb enabled: True - regex: memcached @@ -171,6 +173,7 @@ kolla_enable_glance: "yes" kolla_enable_ironic: "yes" kolla_enable_neutron: "yes" kolla_enable_magnum: "no" +kolla_enable_murano: "no" kolla_enable_sahara: "no" kolla_enable_swift: "yes" diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml index 3b9efc8ab..bc404e731 100644 --- a/ansible/kolla-openstack.yml +++ b/ansible/kolla-openstack.yml @@ -19,6 +19,7 @@ - { name: ironic, file: ironic.conf } - { name: ironic_dnsmasq, file: ironic/ironic-dnsmasq.conf } - { name: magnum, file: magnum.conf } + - { name: murano, file: murano.conf } - { name: neutron, file: neutron.conf } - { name: neutron_ml2, file: neutron/ml2_conf.ini } - { name: nova, file: nova.conf } @@ -94,6 +95,7 @@ kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}" kolla_extra_ironic_dnsmasq: "{{ kolla_extra_config.ironic_dnsmasq | 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_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}" kolla_extra_nova: "{{ kolla_extra_config.nova | default }}" diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml index 80efb7ba6..b61fa99d3 100644 --- a/ansible/roles/kolla-openstack/defaults/main.yml +++ b/ansible/roles/kolla-openstack/defaults/main.yml @@ -177,6 +177,15 @@ kolla_enable_magnum: # Free form extra configuration to append to magnum.conf. 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. diff --git a/ansible/roles/kolla-openstack/tasks/config.yml b/ansible/roles/kolla-openstack/tasks/config.yml index 7ef20cf42..c013e229a 100644 --- a/ansible/roles/kolla-openstack/tasks/config.yml +++ b/ansible/roles/kolla-openstack/tasks/config.yml @@ -23,6 +23,7 @@ - { 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: 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: nova.conf.j2, dest: nova.conf, enabled: "{{ kolla_enable_nova }}" } - { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" } diff --git a/ansible/roles/kolla-openstack/templates/murano.conf.j2 b/ansible/roles/kolla-openstack/templates/murano.conf.j2 new file mode 100644 index 000000000..5d6af4b97 --- /dev/null +++ b/ansible/roles/kolla-openstack/templates/murano.conf.j2 @@ -0,0 +1,9 @@ +# {{ ansible_managed }} + +{% if kolla_extra_murano %} +####################### +# Extra configuration +####################### + +{{ kolla_extra_murano }} +{% endif %}