summaryrefslogtreecommitdiffstats
path: root/xci/playbooks/configure-targethosts.yml
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-12-06 10:26:53 +0000
committerMarkos Chandras <mchandras@suse.de>2017-12-11 14:52:29 +0000
commit272820005530af9db4d06510b812f7ad60c17bd0 (patch)
treea10a890d567472cc6ed95f821695279df7537c01 /xci/playbooks/configure-targethosts.yml
parent598bfb45906ead1f20009020a2466f21985d210f (diff)
xci: Use local playbooks for XCI deployments
Previously, we used to clone the releng-xci repository under a directory in /tmp, copy our changes to that repository and then run the xci-deploy.sh script from it. However, this made things far too complex for deployers and developers since some playbooks were used from the local repo whereas others were used from teh /tmp checkout. By running everything from our local repository simplifies things a lot since we can directly test our changes and also reduces the code we have in our playbooks. Change-Id: If16aa51b2846c170676df82d25cb90e26b1568b2 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/playbooks/configure-targethosts.yml')
-rw-r--r--xci/playbooks/configure-targethosts.yml16
1 files changed, 12 insertions, 4 deletions
diff --git a/xci/playbooks/configure-targethosts.yml b/xci/playbooks/configure-targethosts.yml
index b7b09cfb..d136f436 100644
--- a/xci/playbooks/configure-targethosts.yml
+++ b/xci/playbooks/configure-targethosts.yml
@@ -10,11 +10,15 @@
- hosts: controller
remote_user: root
vars_files:
- - ../var/flavor-vars.yml
+ - ../var/opnfv.yml
+
pre_tasks:
- name: Load distribution variables
include_vars:
- file: ../var/{{ ansible_os_family }}.yml
+ file: "{{ item }}"
+ with_items:
+ - ../var/{{ ansible_os_family }}.yml
+ - ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
roles:
- role: configure-network
# we need to force sync time with ntp or the nodes will be out of sync timewise
@@ -23,12 +27,16 @@
- hosts: compute
remote_user: root
vars_files:
- - ../var/flavor-vars.yml
- ../var/opnfv.yml
+
pre_tasks:
- name: Load distribution variables
include_vars:
- file: ../var/{{ ansible_os_family }}.yml
+ file: "{{ item }}"
+ with_items:
+ - ../var/opnfv.yml
+ - ../var/{{ ansible_os_family }}.yml
+ - ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
roles:
- role: configure-network
# we need to force sync time with ntp or the nodes will be out of sync timewise