diff options
Diffstat (limited to 'xci/installer')
7 files changed, 25 insertions, 13 deletions
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml index 23f93852..9fb4da19 100644 --- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml +++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml @@ -56,11 +56,11 @@ - name: copy k8s_cluster.yml shell: "cp -rf {{ remote_xci_path }}/xci/installer/kubespray/files/k8s-cluster.yml \ {{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars" - - name: install dbus and ptyhon-netaddr - apt: - name: "{{item}}" - update_cache: yes - with_items: "{{ kube_require_packages }}" + - name: Install required packages + package: + name: "{{ kube_require_packages[ansible_pkg_mgr] }}" + state: present + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" when: XCI_FLAVOR == 'aio' - name: pip install ansible pip: diff --git a/xci/installer/kubespray/playbooks/configure-targethosts.yml b/xci/installer/kubespray/playbooks/configure-targethosts.yml index 7e29025b..08c735b4 100644 --- a/xci/installer/kubespray/playbooks/configure-targethosts.yml +++ b/xci/installer/kubespray/playbooks/configure-targethosts.yml @@ -6,11 +6,11 @@ copy: src: "{{ XCI_PATH }}/xci/files/authorized_keys" dest: /root/.ssh/authorized_keys - - name: install dbus and ptyhon-netaddr - apt: - name: "{{item}}" - update_cache: yes - with_items: "{{ kube_require_packages }}" + - name: Install required packages + package: + name: "{{ kube_require_packages[ansible_pkg_mgr] }}" + state: present + update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}" - hosts: kube-master remote_user: root diff --git a/xci/installer/kubespray/playbooks/group_vars/all b/xci/installer/kubespray/playbooks/group_vars/all index 06dccb68..87ed63bd 100644 --- a/xci/installer/kubespray/playbooks/group_vars/all +++ b/xci/installer/kubespray/playbooks/group_vars/all @@ -1,6 +1,13 @@ kube_require_packages: - - "python-netaddr" - - "dbus" + apt: + - python-netaddr + - dbus + yum: + - python-netaddr + - dbus + zypper: + - python-netaddr + - dbus-1 keepalived_ubuntu_src: "uca" keepalived_uca_apt_repo_url: "{{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }}" @@ -10,7 +17,7 @@ keepalived_sync_groups: instances: - external -haproxy_keepalived_external_interface: "{{ interface }}" +haproxy_keepalived_external_interface: "{{ ansible_default_ipv4.interface }}" haproxy_keepalived_authentication_password: 'keepalived' keepalived_instances: external: diff --git a/xci/installer/osa/files/ha/user_variables.yml b/xci/installer/osa/files/ha/user_variables.yml index 72960a01..ea349456 100644 --- a/xci/installer/osa/files/ha/user_variables.yml +++ b/xci/installer/osa/files/ha/user_variables.yml @@ -62,6 +62,7 @@ barbican_wsgi_processes: 2 barbican_wsgi_threads: 1 ## Cinder +cinder_volume_clear: none cinder_wsgi_processes_max: 2 cinder_wsgi_threads: 1 cinder_wsgi_buffer_size: 16384 diff --git a/xci/installer/osa/files/mini/user_variables.yml b/xci/installer/osa/files/mini/user_variables.yml index 9ec9e405..c812f1df 100644 --- a/xci/installer/osa/files/mini/user_variables.yml +++ b/xci/installer/osa/files/mini/user_variables.yml @@ -62,6 +62,7 @@ barbican_wsgi_processes: 2 barbican_wsgi_threads: 1 ## Cinder +cinder_volume_clear: none cinder_wsgi_processes_max: 2 cinder_wsgi_threads: 1 cinder_wsgi_buffer_size: 16384 diff --git a/xci/installer/osa/files/noha/user_variables.yml b/xci/installer/osa/files/noha/user_variables.yml index 66573428..91ceba2d 100644 --- a/xci/installer/osa/files/noha/user_variables.yml +++ b/xci/installer/osa/files/noha/user_variables.yml @@ -62,6 +62,7 @@ barbican_wsgi_processes: 2 barbican_wsgi_threads: 1 ## Cinder +cinder_volume_clear: none cinder_wsgi_processes_max: 2 cinder_wsgi_threads: 1 cinder_wsgi_buffer_size: 16384 diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index de922d3c..4d75f115 100644 --- a/xci/installer/osa/playbooks/configure-opnfvhost.yml +++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml @@ -28,6 +28,8 @@ roles: - role: configure-network when: XCI_FLAVOR != "aio" + # we need to force sync time with ntp or the nodes will be out of sync timewise + - role: synchronize-time tasks: - name: generate SSH keys |