Merge "Actually remove Ironic container creation from AIO preparation"

This commit is contained in:
Jenkins 2016-06-10 17:15:24 +00:00 committed by Gerrit Code Review
commit 96e2f9553b

View File

@ -50,6 +50,8 @@
override: "{{ horizon_env_overrides | default({}) }}"
- name: infra.yml
override: "{{ infra_env_overrides | default({}) }}"
- name: ironic.yml
override: "{{ ironic_env_overrides | default({}) }}"
- name: keystone.yml
override: "{{ keystone_env_overrides | default({}) }}"
- name: memcache.yml
@ -90,8 +92,6 @@
override: "{{ ceilometer_conf_overrides | default({}) }}"
- name: swift.yml.aio
override: "{{ swift_conf_overrides | default({}) }}"
- name: ironic.yml.aio
override: "{{ ironic_conf_overrides | default({}) }}"
tags:
- deploy-confd