openstack/bifrost
Code Issues Proposed changes

Merge "Fix stdout not defined"

Browse Source
This commit is contained in:
Jenkins 2017-01-05 09:48:08 +00:00 committed by Gerrit Code Review
commit 518264a541
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/bifrost-ironic-install/tasks/bootstrap.yml
View File

@ -234,8 +234,8 @@
owner: "root" owner: "root"
group: "root" group: "root"
with_items: with_items:
- { service_path: "{{ ironic_install_prefix.stdout }}", service_name: 'ironic-api', username: 'ironic', args: '--config-file /etc/ironic/ironic.conf'} - { service_path: "{{ ironic_install_prefix.stdout | default('') }}", service_name: 'ironic-api', username: 'ironic', args: '--config-file /etc/ironic/ironic.conf'}
- { service_path: "{{ ironic_install_prefix.stdout }}", service_name: 'ironic-conductor', username: 'ironic', args: '--config-file /etc/ironic/ironic.conf'} - { service_path: "{{ ironic_install_prefix.stdout | default('') }}", service_name: 'ironic-conductor', username: 'ironic', args: '--config-file /etc/ironic/ironic.conf'}
- name: "Create and populate /tftpboot" - name: "Create and populate /tftpboot"
include: create_tftpboot.yml include: create_tftpboot.yml
- name: "Setup Inventory Hosts Directory" - name: "Setup Inventory Hosts Directory"

2
playbooks/roles/bifrost-ironic-install/tasks/inspector_bootstrap.yml
View File

@ -73,6 +73,6 @@
- name: "Inspector - Place service" - name: "Inspector - Place service"
template: src={{ init_template }} dest={{ init_dest_dir }}{{item.service_name}}{{ init_ext }} owner=root group=root template: src={{ init_template }} dest={{ init_dest_dir }}{{item.service_name}}{{ init_ext }} owner=root group=root
with_items: with_items:
- { service_path: "{{ ironic_install_prefix.stdout }}", service_name: 'ironic-inspector', username: 'ironic', args: '--config-file /etc/ironic-inspector/inspector.conf'} - { service_path: "{{ ironic_install_prefix.stdout | default('') }}", service_name: 'ironic-inspector', username: 'ironic', args: '--config-file /etc/ironic-inspector/inspector.conf'}
- name: "Inspector - Explicitly permit TCP/5050 for ironic-inspector callback" - name: "Inspector - Explicitly permit TCP/5050 for ironic-inspector callback"
command: iptables -I INPUT -p tcp --dport 5050 -i {{network_interface}} -j ACCEPT command: iptables -I INPUT -p tcp --dport 5050 -i {{network_interface}} -j ACCEPT