summaryrefslogtreecommitdiffstats
path: root/lib/ansible/playbooks
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/playbooks')
-rw-r--r--lib/ansible/playbooks/configure_undercloud.yml2
-rw-r--r--lib/ansible/playbooks/deploy_overcloud.yml10
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/ansible/playbooks/configure_undercloud.yml b/lib/ansible/playbooks/configure_undercloud.yml
index f19218c3..91a8f9a4 100644
--- a/lib/ansible/playbooks/configure_undercloud.yml
+++ b/lib/ansible/playbooks/configure_undercloud.yml
@@ -45,7 +45,7 @@
- lineinfile:
path: /usr/lib/python2.7/site-packages/ironic/common/pxe_utils.py
regexp: '_link_ip_address_pxe_configs'
- line: '_link_mac_pxe_configs(task)'
+ line: ' _link_mac_pxe_configs(task)'
when: aarch64
- block:
- name: undercloud install
diff --git a/lib/ansible/playbooks/deploy_overcloud.yml b/lib/ansible/playbooks/deploy_overcloud.yml
index a16c81f5..19e46380 100644
--- a/lib/ansible/playbooks/deploy_overcloud.yml
+++ b/lib/ansible/playbooks/deploy_overcloud.yml
@@ -32,11 +32,13 @@
become: yes
become_user: stack
- name: Import inventory (baremetal)
- shell: "{{ stackrc }} && {{ item }}"
- with_items:
- - openstack overcloud node import instackenv.json
- - openstack overcloud node introspect --all-manageable --provide
+ shell: "{{ stackrc }} && openstack overcloud node import instackenv.json"
when: not virtual
+ - name: Introspect inventory (baremetal)
+ shell: "{{ stackrc }} && openstack overcloud node introspect --all-manageable --provide"
+ when:
+ - not virtual
+ - not aarch64
- name: Import inventory (virtual)
shell: "{{ stackrc }} && openstack overcloud node import --provide instackenv.json"
when: virtual