Merge "Add ironic_rabbitmq settings to group_vars/all.yml"

This commit is contained in:
Jenkins 2016-09-27 01:51:19 +00:00 committed by Gerrit Code Review
commit ba1af246ae
2 changed files with 5 additions and 2 deletions

View File

@ -240,6 +240,11 @@ heat_rabbitmq_telemetry_host_group: "{{ heat_rabbitmq_host_group }}"
heat_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['ceilometer_all'] | length > 0) }}"
## Ironic
ironic_rabbitmq_userid: ironic
ironic_rabbitmq_vhost: /ironic
ironic_rabbitmq_port: "{{ rabbitmq_port }}"
ironic_rabbitmq_servers: "{{ rabbitmq_servers }}"
ironic_rabbitmq_use_ssl: "{{ rabbitmq_use_ssl }}"
ironic_rabbitmq_host_group: "{{ rabbitmq_host_group }}"
ironic_service_name: ironic
ironic_service_proto: http

View File

@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
ironic_rabbitmq_vhost: /ironic
ironic_rabbitmq_userid: ironic
ironic_galera_database: ironic
ironic_galera_user: ironic
ironic_service_adminurl: "{{ ironic_service_adminuri }}/v1"