openstack
/
kayobe
Code Issues Proposed changes

Merge "Revert ironic custom configuration"

This commit is contained in:
Zuul 2021-03-01 15:22:12 +00:00 committed by Gerrit Code Review
parent f9d9afcfba 5af7cac17e
commit 8273788c8c
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/kayobe-overcloud-base/ironic.conf
View File

@ -1,2 +0,0 @@
[DEFAULT]
minimum_required_memory = 256

11
playbooks/kayobe-overcloud-base/pre.yml
View File

@ -16,17 +16,6 @@
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml" dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
when: tls_enabled when: tls_enabled
- name: Ensure kolla custom config dir exists
file:
path: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config"
state: directory
# TODO(mgoddard): Remove this when it has been added to kayobe-config-dev.
- name: Ensure ironic.conf override config file exists
copy:
src: ironic.conf
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/ironic.conf"
# NOTE(mgoddard): The kayobe dev config by default expects a bridge - # NOTE(mgoddard): The kayobe dev config by default expects a bridge -
# breth1 - to exist with an IP address of 192.168.33.3. # breth1 - to exist with an IP address of 192.168.33.3.
- name: Ensure all-in-one network bridge interface exists - name: Ensure all-in-one network bridge interface exists