summaryrefslogtreecommitdiffstats
path: root/util/docker-compose
diff options
context:
space:
mode:
authorYibo Cai <yibo.cai@arm.com>2018-04-04 14:06:34 +0800
committerYibo Cai <yibo.cai@arm.com>2018-04-16 10:11:37 +0000
commit3ede18e758c77b31e56ca9164dbeb8e06b0223b5 (patch)
treed81b88b2fae918ed0023dc9855ac9af1d4714747 /util/docker-compose
parentb69dfdca72868b884a583d15ad70ffd0c991dd52 (diff)
cobbler: support deploying ubuntu on arm
Deploy ubuntu by setting ADAPTER_OS_PATTERN='(?i)ubuntu-16.*arm.*' and OS_VERSION=xenial. Change-Id: I1035a2d45225fceab6eead35d77d98130def373b Signed-off-by: Yibo Cai <yibo.cai@arm.com>
Diffstat (limited to 'util/docker-compose')
-rwxr-xr-xutil/docker-compose/group_vars/all6
-rwxr-xr-xutil/docker-compose/roles/cobbler/tasks/main.yml4
2 files changed, 5 insertions, 5 deletions
diff --git a/util/docker-compose/group_vars/all b/util/docker-compose/group_vars/all
index 920589ce..8bdc57b5 100755
--- a/util/docker-compose/group_vars/all
+++ b/util/docker-compose/group_vars/all
@@ -46,9 +46,9 @@ distros_x86_64:
distros_aarch64:
ubuntu-16.04:
breed: "ubuntu"
- kickstart: "default16.seed"
- kopts: "netcfg/choose_interface=auto console=ttyS0 console=ttyAMA0 console=tty0 net.ifnames=0"
- kopts_post: "console=ttyS0 console=ttyAMA0 console=tty0 net.ifnames=0"
+ kickstart: "default16-aarch64.seed"
+ kopts: "netcfg/choose_interface=auto console=ttyS0 console=ttyAMA0 net.ifnames=0"
+ kopts_post: "console=ttyS0 console=ttyAMA0 net.ifnames=0"
extra: "--apt-dists=xenial --apt-components=main"
aliase: "xenial"
version: "ubuntu"
diff --git a/util/docker-compose/roles/cobbler/tasks/main.yml b/util/docker-compose/roles/cobbler/tasks/main.yml
index 0a30e0c5..e4e2cf30 100755
--- a/util/docker-compose/roles/cobbler/tasks/main.yml
+++ b/util/docker-compose/roles/cobbler/tasks/main.yml
@@ -102,7 +102,7 @@
# - ubuntu-16.04-server-arm-arm64-arm
# Kickstart meta url name
# - http://x.x.x.x/cobbler/ks_mirror/CentOS-7-Minimal-1611-arm
- # - http://x.x.x.x/cobbler/ks_mirror/ubuntu-16.04-server-arm-arm64
+ # - http://x.x.x.x/cobbler/ks_mirror/ubuntu-16.04-server-arm
name="{{ item.value.cobbler_name }}-arm"
profiles=`docker exec compass-cobbler bash -c \
"cobbler profile list | grep $name"`
@@ -112,7 +112,7 @@
--name $profile_name \
--name-servers '' \
--repos {{ item.value.ppa_name }} \
- --ksmeta \"tree=http://{{ host_ip }}/cobbler/ks_mirror/${profile_name%????}\" \
+ --ksmeta \"tree=http://{{ host_ip }}/cobbler/ks_mirror/$name\" \
--kopts \"{{ item.value.kopts | default('') }}\" \
--kopts-post \"{{ item.value.kopts_post | default('') }}\""
done