diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-04-20 13:37:32 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2018-05-18 11:40:46 +0100 |
| commit | c5e7e23fadc2738985ac6b3e585edd9918f6494b (patch) | |
| tree | 5c49615a74bb58fa78e98348bc5e3d8f264164da | |
| parent | 0ed80c59846e9e1b23d26869f05f109dac7495c5 (diff) | |
xci: kubespray: Use bootstrap role for k8s deployments
The bootstrap role configures NTP and networking on hosts so we
should use it on k8s deployments as well.
installer-type:kubespray
deploy-scenario:k8-nosdn-nofeature
Change-Id: I04bd1e1c2c325baabfb836bd8cca60c5f59344c7
Signed-off-by: Markos Chandras <mchandras@suse.de>
3 files changed, 20 insertions, 1 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index 7141f512..5886d3e9 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -11,7 +11,7 @@ vars_files: - "{{ xci_path }}/xci/var/opnfv.yml" - tasks: + pre_tasks: - name: Load distribution variables include_vars: file: "{{ item }}" @@ -23,6 +23,11 @@ remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{ installer_type }}/files/{{ xci_flavor }}" remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks" + roles: + - role: bootstrap-host + configure_network: xci_flavor != 'aio' + + tasks: - name: Copy releng-xci to remote host synchronize: src: "{{ xci_path }}/" diff --git a/xci/installer/kubespray/playbooks/configure-targethosts.yml b/xci/installer/kubespray/playbooks/configure-targethosts.yml index c744eae6..7989bfb6 100644 --- a/xci/installer/kubespray/playbooks/configure-targethosts.yml +++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml @@ -1,6 +1,19 @@ --- - hosts: k8s-cluster remote_user: root + vars_files: + - "{{ xci_path }}/xci/var/opnfv.yml" + + pre_tasks: + - name: Load distribution variables + include_vars: + file: "{{ item }}" + with_items: + - "{{ xci_path }}/xci/var/{{ ansible_os_family }}.yml" + + roles: + - role: bootstrap-host + tasks: - name: Manage SSH keys include_tasks: "{{ xci_path }}/xci/playbooks/manage-ssh-keys.yml" diff --git a/xci/playbooks/roles/bootstrap-host/templates/kubespray b/xci/playbooks/roles/bootstrap-host/templates/kubespray new file mode 120000 index 00000000..f820fd11 --- /dev/null +++ b/xci/playbooks/roles/bootstrap-host/templates/kubespray @@ -0,0 +1 @@ +osa
\ No newline at end of file |