From 979caf7b697d59ff2452d47728a827d516fc7701 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 5 Aug 2019 13:37:19 +0200 Subject: Add the required dashes in yaml files deploy-scenario:k8-calico-nofeature installer-type:osh Change-Id: I0423ab27186316d40c93cce847d7cb9fa7308df1 Signed-off-by: Manuel Buil --- xci/installer/osh/playbooks/group_vars/all | 54 --------------------- xci/installer/osh/playbooks/group_vars/all.yml | 55 ++++++++++++++++++++++ .../roles/install-osh-noha/tasks/main.yml | 1 + .../roles/prepare-kube-nodes-osh/tasks/main.yml | 1 + .../roles/prepare-opnfvhost-osh/tasks/main.yml | 1 + .../osh/playbooks/roles/prepare-osh/tasks/main.yml | 1 + .../osh/playbooks/roles/prepare-osh/vars/main.yml | 1 + 7 files changed, 60 insertions(+), 54 deletions(-) delete mode 100644 xci/installer/osh/playbooks/group_vars/all create mode 100644 xci/installer/osh/playbooks/group_vars/all.yml (limited to 'xci') diff --git a/xci/installer/osh/playbooks/group_vars/all b/xci/installer/osh/playbooks/group_vars/all deleted file mode 100644 index 328f8dba..00000000 --- a/xci/installer/osh/playbooks/group_vars/all +++ /dev/null @@ -1,54 +0,0 @@ -keepalived_ubuntu_src: "uca" -keepalived_uca_apt_repo_url: "{{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }}" - -keepalived_sync_groups: - haproxy: - instances: - - external - -haproxy_keepalived_external_interface: "{{ ansible_default_ipv4.interface }}" -haproxy_keepalived_authentication_password: 'keepalived' -keepalived_instances: - external: - interface: "{{ haproxy_keepalived_external_interface }}" - state: "BACKUP" - virtual_router_id: "{{ haproxy_keepalived_external_virtual_router_id | default ('10') }}" - priority: "{{ ((ansible_play_hosts|length-ansible_play_hosts.index(inventory_hostname))*100)-((ansible_play_hosts|length-ansible_play_hosts.index(inventory_hostname))*50) }}" - authentication_password: "{{ haproxy_keepalived_authentication_password }}" - vips: - - "{{ haproxy_keepalived_external_vip_cidr | default('192.168.122.222/32') }} dev {{ haproxy_keepalived_external_interface }}" - -haproxy_default_services: - - service: - haproxy_service_name: proxy-apiserver - haproxy_backend_nodes: "{{ groups['kube-master'] | default([]) }}" - haproxy_port: 8383 - haproxy_backend_port: 6443 - haproxy_balance_type: tcp - -haproxy_bind_on_non_local: "True" -haproxy_use_keepalived: "True" -keepalived_selinux_compile_rules: - - keepalived_ping - - keepalived_haproxy_pid_file - -# Ensure that the package state matches the global setting -haproxy_package_state: "latest" - -haproxy_whitelist_networks: - - 192.168.0.0/16 - - 172.16.0.0/12 - - 10.0.0.0/8 - -haproxy_galera_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_glance_registry_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_keystone_admin_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_nova_metadata_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_rabbitmq_management_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_repo_git_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_repo_cache_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_octavia_whitelist_networks: "{{ haproxy_whitelist_networks }}" -haproxy_ssl: false - -internal_lb_vip_address: "192.168.122.222" -external_lb_vip_address: "{{ internal_lb_vip_address }}" diff --git a/xci/installer/osh/playbooks/group_vars/all.yml b/xci/installer/osh/playbooks/group_vars/all.yml new file mode 100644 index 00000000..7453bdab --- /dev/null +++ b/xci/installer/osh/playbooks/group_vars/all.yml @@ -0,0 +1,55 @@ +--- +keepalived_ubuntu_src: "uca" +keepalived_uca_apt_repo_url: "{{ uca_apt_repo_url | default('http://ubuntu-cloud.archive.canonical.com/ubuntu') }}" + +keepalived_sync_groups: + haproxy: + instances: + - external + +haproxy_keepalived_external_interface: "{{ ansible_default_ipv4.interface }}" +haproxy_keepalived_authentication_password: 'keepalived' +keepalived_instances: + external: + interface: "{{ haproxy_keepalived_external_interface }}" + state: "BACKUP" + virtual_router_id: "{{ haproxy_keepalived_external_virtual_router_id | default ('10') }}" + priority: "{{ ((ansible_play_hosts|length-ansible_play_hosts.index(inventory_hostname))*100)-((ansible_play_hosts|length-ansible_play_hosts.index(inventory_hostname))*50) }}" + authentication_password: "{{ haproxy_keepalived_authentication_password }}" + vips: + - "{{ haproxy_keepalived_external_vip_cidr | default('192.168.122.222/32') }} dev {{ haproxy_keepalived_external_interface }}" + +haproxy_default_services: + - service: + haproxy_service_name: proxy-apiserver + haproxy_backend_nodes: "{{ groups['kube-master'] | default([]) }}" + haproxy_port: 8383 + haproxy_backend_port: 6443 + haproxy_balance_type: tcp + +haproxy_bind_on_non_local: "True" +haproxy_use_keepalived: "True" +keepalived_selinux_compile_rules: + - keepalived_ping + - keepalived_haproxy_pid_file + +# Ensure that the package state matches the global setting +haproxy_package_state: "latest" + +haproxy_whitelist_networks: + - 192.168.0.0/16 + - 172.16.0.0/12 + - 10.0.0.0/8 + +haproxy_galera_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_glance_registry_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_keystone_admin_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_nova_metadata_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_rabbitmq_management_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_repo_git_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_repo_cache_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_octavia_whitelist_networks: "{{ haproxy_whitelist_networks }}" +haproxy_ssl: false + +internal_lb_vip_address: "192.168.122.222" +external_lb_vip_address: "{{ internal_lb_vip_address }}" diff --git a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml index 231572c9..9e783cb7 100644 --- a/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml +++ b/xci/installer/osh/playbooks/roles/install-osh-noha/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Setup Clients command: ./tools/deployment/multinode/010-setup-client.sh changed_when: false diff --git a/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml index 5a70f971..ff0aff60 100644 --- a/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml +++ b/xci/installer/osh/playbooks/roles/prepare-kube-nodes-osh/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Install packages in kubernetes nodes package: name: "{{ packages }}" diff --git a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml index 7e2a52ab..b31dc706 100644 --- a/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml +++ b/xci/installer/osh/playbooks/roles/prepare-opnfvhost-osh/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Set kubernetes service account permissions command: "kubectl create clusterrolebinding add-on-cluster-admin --clusterrole=cluster-admin --serviceaccount=kube-system:default" changed_when: false diff --git a/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml b/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml index d9718ea4..aeaca6be 100644 --- a/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml +++ b/xci/installer/osh/playbooks/roles/prepare-osh/tasks/main.yml @@ -1,3 +1,4 @@ +--- - name: Write new resolv.conf file template: src: resolv.conf.j2 diff --git a/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml b/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml index abb0d6eb..4d6f9cbb 100644 --- a/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml +++ b/xci/installer/osh/playbooks/roles/prepare-osh/vars/main.yml @@ -1,3 +1,4 @@ +--- kube_dns_ip: "10.233.0.3" external_dns_nameservers: - '{{kube_dns_ip}}' -- cgit