diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-03-30 22:49:23 +0200 |
|---|---|---|
| committer |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
| commit | 8536f94d9dd56bbb56906c7c29d3b15f5970e0ae (patch) | |
| tree | 24afc831a86dc4b9725fedc31449a4653697a33c /xci | |
| parent | 99f5becbe368895b07dddc109da5333caf3a12f6 (diff) | |
xci: Move role configure-network to the right place
Incorrectly placed role configure-network causes ansible to skip
the roles at the beginning of the playbook.
Change-Id: Id85e9684eb86acad7c11104b434a319c37e16903
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/playbooks/configure-opnfvhost.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index abebd1d7..6689c8dc 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -17,6 +17,8 @@ - role: remove-folders - { role: clone-repository, project: "opnfv/releng", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" } - { role: clone-repository, project: "openstack/openstack-ansible", repo: "{{ OPENSTACK_OSA_GIT_URL }}", dest: "{{ OPENSTACK_OSA_PATH }}", version: "{{ OPENSTACK_OSA_VERSION }}" } + # TODO: this only works for ubuntu/xenial and need to be adjusted for other distros + - { role: configure-network, when: ansible_distribution_release == "xenial", src: "../template/opnfv.interface.j2", dest: "/etc/network/interfaces" } tasks: - name: generate SSH keys shell: ssh-keygen -b 2048 -t rsa -f /root/.ssh/id_rsa -q -N "" @@ -48,9 +50,6 @@ shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks" - name: copy OPNFV role requirements shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/ansible-role-requirements.yml {{OPENSTACK_OSA_PATH}}" - roles: - # TODO: this only works for ubuntu/xenial and need to be adjusted for other distros - - { role: configure-network, when: ansible_distribution_release == "xenial", src: "../template/opnfv.interface.j2", dest: "/etc/network/interfaces" } - hosts: localhost remote_user: root tasks: |