aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
Diffstat (limited to 'deploy')
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml33
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars.yml7
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml11
-rw-r--r--deploy/compass_conf/adapter/ansible_kubernetes.conf2
-rw-r--r--deploy/conf/compass.conf44
5 files changed, 82 insertions, 15 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml
new file mode 100644
index 00000000..26e3fa75
--- /dev/null
+++ b/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars-aarch64.yml
@@ -0,0 +1,33 @@
+---
+# Override default kubespray variables
+
+# roles/download/defaults/main.yml
+etcd_version: v3.2.4-arm64
+flannel_version: "v0.8.0-arm64"
+flannel_cni_image_repo: "linaro/flannel-cni-arm64"
+hyperkube_image_repo: "gcr.io/google-containers/hyperkube-arm64"
+hyperkube_image_tag: "{{ kube_version }}"
+pod_infra_image_repo: "gcr.io/google_containers/pause-arm64"
+nginx_image_tag: 1.13
+kubedns_image_repo: "gcr.io/google_containers/k8s-dns-kube-dns-arm64"
+dnsmasq_nanny_image_repo: "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-arm64"
+dnsmasq_sidecar_image_repo: "gcr.io/google_containers/k8s-dns-sidecar-arm64"
+kubednsautoscaler_image_repo: "gcr.io/google_containers/\
+cluster-proportional-autoscaler-arm64"
+
+# inventory/group_vars/k8s-cluster.yml
+kube_network_plugin: flannel
+helm_enabled: false
+docker_options: "--insecure-registry={{ kube_service_addresses }} \
+--graph={{ docker_daemon_graph }} {{ docker_log_opts }} \
+--add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \
+--default-runtime=docker-runc \
+--exec-opt native.cgroupdriver=systemd \
+--userland-proxy-path=/usr/libexec/docker/docker-proxy-current \
+--signature-verification=false"
+
+# roles/docker/vars/redhat.yml
+docker_package_info:
+ pkg_mgr: yum
+ pkgs:
+ - name: docker
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars.yml
new file mode 100644
index 00000000..e13e33ca
--- /dev/null
+++ b/deploy/adapters/ansible/kubernetes/roles/kargo/files/extra-vars.yml
@@ -0,0 +1,7 @@
+---
+# Override default kubespray variables
+
+# Just a placeholder to satisfy ansible
+dummy_var: 0
+
+# helm_enabled: true
diff --git a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
index 4df8dffa..2763e53e 100644
--- a/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
+++ b/deploy/adapters/ansible/kubernetes/roles/kargo/tasks/main.yml
@@ -96,9 +96,18 @@
regexp: '^helm_enabled:'
line: 'helm_enabled: {{ helm_flag }}'
+- name: copy overrided variables
+ copy:
+ src: "{{ item }}"
+ dest: /opt/kargo_k8s/extra-vars.yml
+ with_first_found:
+ - extra-vars-{{ ansible_architecture }}.yml
+ - extra-vars.yml
+
- name: run kargo playbook
shell: |
cd /opt/kargo_k8s
- ansible-playbook -i inventory/inventory.cfg cluster.yml -b -v 2>&1 | tee kargo.log
+ ansible-playbook -i inventory/inventory.cfg cluster.yml \
+ -e "@extra-vars.yml" -b -v 2>&1 | tee kargo.log
tags:
- ansible
diff --git a/deploy/compass_conf/adapter/ansible_kubernetes.conf b/deploy/compass_conf/adapter/ansible_kubernetes.conf
index a3ab671a..70e5564c 100644
--- a/deploy/compass_conf/adapter/ansible_kubernetes.conf
+++ b/deploy/compass_conf/adapter/ansible_kubernetes.conf
@@ -3,5 +3,5 @@ DISPLAY_NAME = 'Kubernetes'
PARENT = 'general'
PACKAGE_INSTALLER = 'ansible_installer_kubernetes'
OS_INSTALLER = 'cobbler'
-SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-16\.04', '(?i)CentOS-7.*16.*', '(?i)CentOS-7.*arm.*']
+SUPPORTED_OS_PATTERNS = ['(?i)ubuntu-16\.04\.3', '(?i)CentOS-7.*17.*', '(?i)CentOS-7.*arm.*']
DEPLOYABLE = True
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 8a3bb3a3..78dd141b 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -18,19 +18,37 @@ export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
export COMPASS_REPO_PORT="5151"
export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
-# Set docker registry for architectures other than x86_64
-COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-compass4nfv}
+if [ "$COMPASS_ARCH" = "aarch64" ]; then
+ # Docker images for aarch64
-export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
-# export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa:euphrates"
-export COMPASS_TASKS="yifei0van0xue/compass-tasks-osa"
+ # Arm images are temporarily held at dockerhub linaro repo
+ COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-linaro}
-if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
- export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
-fi
+ export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
+ export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa"
+
+ if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
+ export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
+ fi
+
+ export COMPASS_DB="$COMPASS_DOCKER_REPO/compass-db"
+ export COMPASS_MQ="$COMPASS_DOCKER_REPO/compass-mq"
+ export COMPASS_REPO="$COMPASS_DOCKER_REPO/compass-repo-osa-ubuntu:euphrates"
+ export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
+
+else
+ # Docker images for x86_64
-# export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
-export COMPASS_DB="$COMPASS_DOCKER_REPO/compass-db"
-export COMPASS_MQ="$COMPASS_DOCKER_REPO/compass-mq"
-export COMPASS_REPO="$COMPASS_DOCKER_REPO/compass-repo-osa-ubuntu:euphrates"
-export COMPASS_COBBLER="yifei0van0xue/compass-cobbler"
+ export COMPASS_DECK="compass4nfv/compass-deck"
+ export COMPASS_TASKS="yifei0van0xue/compass-tasks-osa"
+
+ if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
+ export COMPASS_TASKS="compass4nfv/compass-tasks-k8s"
+ fi
+
+ export COMPASS_DB="compass4nfv/compass-db"
+ export COMPASS_MQ="compass4nfv/compass-mq"
+ export COMPASS_REPO="compass4nfv/compass-repo-osa-ubuntu:euphrates"
+ export COMPASS_COBBLER="yifei0van0xue/compass-cobbler"
+
+fi