Code Review
/
ta
/
infra-ansible.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: remove stray quote
[ta/infra-ansible.git]
/
playbooks
/
baremetal-install.yml
diff --git
a/playbooks/baremetal-install.yml
b/playbooks/baremetal-install.yml
index
26279d0
..
12c95bd
100644
(file)
--- a/
playbooks/baremetal-install.yml
+++ b/
playbooks/baremetal-install.yml
@@
-26,7
+26,6
@@
- hosts|count > 1
- reinitialized_nodes is not defined or (inventory_hostname not in reinitialized_nodes)
- hosts|count > 1
- reinitialized_nodes is not defined or (inventory_hostname not in reinitialized_nodes)
-
- name: Make sure nfs server is toren down before we start
hosts: baremetal-infra_hosts
tasks:
- name: Make sure nfs server is toren down before we start
hosts: baremetal-infra_hosts
tasks:
@@
-37,8
+36,11
@@
- name: NFS server setup
hosts: baremetal-infra_hosts
- name: NFS server setup
hosts: baremetal-infra_hosts
+ vars_files:
+ - "/etc/ansible/roles/baremetal_provision/defaults/main.yml"
tasks:
- include: baremetal-setup-nfs-server.yaml
tasks:
- include: baremetal-setup-nfs-server.yaml
+ - include: baremetal_setup_http.yml
when: hosts|count > 1
- name: Setup NFS mount points on other controllers where Ironic conductor is running
when: hosts|count > 1
- name: Setup NFS mount points on other controllers where Ironic conductor is running
@@
-52,12
+54,16
@@
- reinitialized_nodes is not defined or (inventory_hostname not in reinitialized_nodes)
- name: Install baremetal nodes for this cloud infra
- reinitialized_nodes is not defined or (inventory_hostname not in reinitialized_nodes)
- name: Install baremetal nodes for this cloud infra
- hosts: baremetal-
infra_host
s
- gather_facts:
"{{ gather_facts | default(True) }}"
+ hosts: baremetal-
node
s
+ gather_facts:
False
max_fail_percentage: 20
max_fail_percentage: 20
+ # TODO: This is just to work around the unavailable ironic_service_adminurl variable
+ vars_files:
+ - /opt/openstack-ansible/inventory/group_vars/ironic_all.yml
roles:
- role: baremetal_provision
when: hosts|count > 1
roles:
- role: baremetal_provision
when: hosts|count > 1
+ delegate_to: localhost
- name: Tear down NFS mount points on other controllers where Ironic conductor is running
hosts: ironic_conductor
- name: Tear down NFS mount points on other controllers where Ironic conductor is running
hosts: ironic_conductor
@@
-72,5
+78,6
@@
hosts: baremetal-infra_hosts
tasks:
- include: baremetal-rm-nfs-server.yaml
hosts: baremetal-infra_hosts
tasks:
- include: baremetal-rm-nfs-server.yaml
+ - include: baremetal_teardown_http.yml
when:
- hosts|count > 1
when:
- hosts|count > 1