diff options
author | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-04-18 11:49:19 +0200 |
---|---|---|
committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-08-11 12:56:12 -0700 |
commit | 4f1f111621c55f1d234d18c59eac889bdc6772a4 (patch) | |
tree | 039458fb6be73fee2d5527872f73b7943267ee01 | |
parent | 093a88d54433a3f3ae23a0371df2b9bb8cad02ec (diff) |
xci: Merge configure-targethosts.yml playbooks into one
They are exactly same now after moving nfs to compute00.
Change-Id: I9d9d2f037aa3684ba130ae0a4f9aef2e733f2d2e
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r-- | xci/file/mini/configure-targethosts.yml | 36 | ||||
-rw-r--r-- | xci/file/noha/configure-targethosts.yml | 36 | ||||
-rw-r--r-- | xci/playbooks/configure-localhost.yml | 6 | ||||
-rw-r--r-- | xci/playbooks/configure-targethosts.yml (renamed from xci/file/ha/configure-targethosts.yml) | 0 |
4 files changed, 0 insertions, 78 deletions
diff --git a/xci/file/mini/configure-targethosts.yml b/xci/file/mini/configure-targethosts.yml deleted file mode 100644 index 50da1f22..00000000 --- a/xci/file/mini/configure-targethosts.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- hosts: all - remote_user: root - tasks: - - name: add public key to host - copy: - src: ../file/authorized_keys - dest: /root/.ssh/authorized_keys - -- hosts: controller - remote_user: root - vars_files: - - ../var/{{ ansible_os_family }}.yml - - ../var/flavor-vars.yml - roles: - # TODO: this only works for ubuntu/xenial and need to be adjusted for other distros - - { role: configure-network, src: "../template/controller.interface.j2", dest: "/etc/network/interfaces" } - # we need to force sync time with ntp or the nodes will be out of sync timewise - - role: synchronize-time - -- hosts: compute - remote_user: root - vars_files: - - ../var/{{ ansible_os_family }}.yml - - ../var/flavor-vars.yml - roles: - # TODO: this only works for ubuntu/xenial and need to be adjusted for other distros - - { role: configure-network, src: "../template/compute.interface.j2", dest: "/etc/network/interfaces" } - # we need to force sync time with ntp or the nodes will be out of sync timewise - - role: synchronize-time - -- hosts: compute00 - remote_user: root - # TODO: this role is for configuring NFS on xenial and adjustment needed for other distros - roles: - - role: configure-nfs diff --git a/xci/file/noha/configure-targethosts.yml b/xci/file/noha/configure-targethosts.yml deleted file mode 100644 index 50da1f22..00000000 --- a/xci/file/noha/configure-targethosts.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- hosts: all - remote_user: root - tasks: - - name: add public key to host - copy: - src: ../file/authorized_keys - dest: /root/.ssh/authorized_keys - -- hosts: controller - remote_user: root - vars_files: - - ../var/{{ ansible_os_family }}.yml - - ../var/flavor-vars.yml - roles: - # TODO: this only works for ubuntu/xenial and need to be adjusted for other distros - - { role: configure-network, src: "../template/controller.interface.j2", dest: "/etc/network/interfaces" } - # we need to force sync time with ntp or the nodes will be out of sync timewise - - role: synchronize-time - -- hosts: compute - remote_user: root - vars_files: - - ../var/{{ ansible_os_family }}.yml - - ../var/flavor-vars.yml - roles: - # TODO: this only works for ubuntu/xenial and need to be adjusted for other distros - - { role: configure-network, src: "../template/compute.interface.j2", dest: "/etc/network/interfaces" } - # we need to force sync time with ntp or the nodes will be out of sync timewise - - role: synchronize-time - -- hosts: compute00 - remote_user: root - # TODO: this role is for configuring NFS on xenial and adjustment needed for other distros - roles: - - role: configure-nfs diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index 2a559645..34b974cd 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -21,12 +21,6 @@ path: "{{LOG_PATH}}" state: directory recurse: no - # when the deployment is not aio, we use playbook, configure-targethosts.yml, to configure all the hosts - - name: copy multihost playbook - copy: - src: "{{XCI_FLAVOR_ANSIBLE_FILE_PATH}}/configure-targethosts.yml" - dest: "{{OPNFV_RELENG_PATH}}/prototypes/xci/playbooks" - when: XCI_FLAVOR != "aio" # when the deployment is aio, we overwrite and use playbook, configure-opnfvhost.yml, since everything gets installed on opnfv host - name: copy aio playbook copy: diff --git a/xci/file/ha/configure-targethosts.yml b/xci/playbooks/configure-targethosts.yml index 50da1f22..50da1f22 100644 --- a/xci/file/ha/configure-targethosts.yml +++ b/xci/playbooks/configure-targethosts.yml |