summaryrefslogtreecommitdiffstats
path: root/xci/playbooks/configure-opnfvhost.yml
diff options
context:
space:
mode:
Diffstat (limited to 'xci/playbooks/configure-opnfvhost.yml')
-rw-r--r--xci/playbooks/configure-opnfvhost.yml29
1 files changed, 6 insertions, 23 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index e9e4f6bb..0ceacc02 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -14,30 +14,18 @@
pre_tasks:
- name: Load distribution variables
include_vars:
- file: ../var/{{ ansible_os_family }}.yml
- file: ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
-
- roles:
- - role: clone-repository
- project: "openstack/openstack-ansible"
- repo: "{{ OPENSTACK_OSA_GIT_URL }}"
- dest: "{{ OPENSTACK_OSA_PATH }}"
- version: "{{ OPENSTACK_OSA_VERSION }}"
-
-- hosts: opnfv
- remote_user: root
- vars_files:
- - ../var/opnfv.yml
- pre_tasks:
- - name: Load distribution variables
- include_vars:
file: "{{ item }}"
with_items:
- ../var/{{ ansible_os_family }}.yml
- ../file/{{ XCI_FLAVOR }}/flavor-vars.yml
+ - name: Set facts for remote deployment
+ set_fact:
+ remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
+ remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/file/{{ XCI_FLAVOR }}"
+ remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
roles:
- - role: configure-network
+ - role: configure-network
tasks:
- name: generate SSH keys
@@ -49,11 +37,6 @@
src: "{{ ansible_env.HOME }}/.ssh/id_rsa.pub"
dest: "../file/authorized_keys"
flat: yes
- - name: Set facts for remote deployment
- set_fact:
- remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
- remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/file/{{ XCI_FLAVOR }}"
- remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
- name: Copy releng-xci to remote host
synchronize:
src: "{{ XCI_PATH }}/"