From 4c5ff9360854b833f54a25550a4463b7665de42f Mon Sep 17 00:00:00 2001 From: Yibo Cai Date: Thu, 26 Apr 2018 16:59:37 +0800 Subject: build: fetch arm64 iso from opnfv artifacts site Change-Id: I248d84be0fb0c6f18054c5fca8d6b5c091730153 Signed-off-by: Yibo Cai --- build/build-aarch64.yaml | 6 +- deploy/compass_conf/os/centos7.3.aarch64.conf | 2 +- .../CentOS-7-Minimal-1708-arm-arm/profile.tmpl | 3 + .../CentOS-7-Minimal-1708-arm-arm/system.tmpl | 76 ++++++++++++++++++++++ util/docker-compose/group_vars/all | 4 +- 5 files changed, 85 insertions(+), 6 deletions(-) create mode 100755 deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/profile.tmpl create mode 100755 deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/system.tmpl diff --git a/build/build-aarch64.yaml b/build/build-aarch64.yaml index 84352284..80495cbf 100644 --- a/build/build-aarch64.yaml +++ b/build/build-aarch64.yaml @@ -1,14 +1,14 @@ --- packages: - - name: CentOS-7-aarch64-Minimal-1611.iso + - name: CentOS-7-aarch64-Minimal-1708.iso description: "Centos ISO of each host for provisioning" get_method: cached - url: $COMPASS_ISO_REPO/CentOS-7-aarch64-Minimal-1611.iso + url: http://artifacts.opnfv.org/compass4nfv/package/master/CentOS-7-aarch64-Minimal-1708.iso - name: ubuntu-16.04-server-arm64.iso description: "Ubuntu ISO of each host for provisioning" get_method: cached - url: $COMPASS_ISO_REPO/ubuntu-16.04-server-arm64.iso + url: http://artifacts.opnfv.org/compass4nfv/package/master/ubuntu-16.04-server-arm64.iso - name: compass-deck description: "RESTful API and DB Handlers for Compass" diff --git a/deploy/compass_conf/os/centos7.3.aarch64.conf b/deploy/compass_conf/os/centos7.3.aarch64.conf index bd3bce30..e6c9f710 100755 --- a/deploy/compass_conf/os/centos7.3.aarch64.conf +++ b/deploy/compass_conf/os/centos7.3.aarch64.conf @@ -1,3 +1,3 @@ -NAME = 'CentOS-7-Minimal-1611-arm-arm' +NAME = 'CentOS-7-Minimal-1708-arm-arm' PARENT = 'CentOS' DEPLOYABLE = True diff --git a/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/profile.tmpl b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/profile.tmpl new file mode 100755 index 00000000..cfa89004 --- /dev/null +++ b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/profile.tmpl @@ -0,0 +1,3 @@ +{ + "repos": "$getVar('repo_name', '')" +} diff --git a/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/system.tmpl b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/system.tmpl new file mode 100755 index 00000000..8e4cbbbe --- /dev/null +++ b/deploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/system.tmpl @@ -0,0 +1,76 @@ +{ + "name": "$hostname", + "hostname": "$hostname", + "profile": "$profile", + "gateway": "$gateway", + #import simplejson as json + #set nameservers = json.dumps($nameservers, encoding='utf-8') + "name_servers": $nameservers, + #set search_path = ' '.join($search_path) + "name_servers_search": "$search_path", + "proxy": "$getVar('http_proxy', '')", + "modify_interface": + #set networks = $networks + #set rekeyed = {} + #set promic_nic = "" + #for $nic, $val in $networks.iteritems(): + #set ip_key = '-'.join(('ipaddress', $nic)) + #set netmask_key = '-'.join(('netmask', $nic)) + #set mgmt_key = '-'.join(('management', $nic)) + #set static_key = '-'.join(('static', $nic)) + #set $rekeyed[$ip_key] = $val.ip + #set $rekeyed[$netmask_key] = $val.netmask + #set $rekeyed[$mgmt_key] = $val.is_mgmt + #set $rekeyed[$static_key] = True + + #set dns_key = '-'.join(('dnsname', $nic)) + #if $val.is_mgmt + #set $rekeyed[$dns_key] = $dns + #else + #if '.' in $dns + #set $dns_name, $dns_domain = $dns.split('.', 1) + #set $dns_nic = '%s-%s.%s' % ($dns_name, $nic, $dns_domain) + #else + #set $dns_nic = '%s-%s' % ($dns, $nic) + #end if + #set $rekeyed[$dns_key] = $dns_nic + #end if + + #if $val.is_promiscuous: + #set promic_nic = $nic + #end if + #if $val.is_mgmt: + #set mac_key = '-'.join(('macaddress', $nic)) + #set $rekeyed[$mac_key] = $mac + #end if + #end for + #set nic_info = json.dumps($rekeyed, encoding='utf-8') + $nic_info + , + "ksmeta":{ + #set partition_config = '' + #for k, v in $partition.iteritems(): + #set path = '' + #if v['vol_percentage']: + #set $path = k + ' ' + str(v['vol_percentage']) + '%' + #else: + #set $path = k + ' ' + str(v['vol_size']) + #end if + #set partition_config = ';'.join((partition_config, $path)) + #end for + #set partition_config = partition_config[1:] + #import crypt + #set $password = crypt.crypt($server_credentials.password, "az") + #set no_proxy = ','.join($getVar('no_proxy', [])) + "username": "$server_credentials.username", + "password": "$password", + "promisc_nics": "$promic_nic", + "partition": "$partition_config", + "https_proxy": "$getVar('https_proxy', '')", + "ntp_server": "$ntp_server", + "timezone": "$timezone", + "ignore_proxy": "$no_proxy", + "local_repo": "$getVar('local_repo', '')", + "disk_num": "1" + } +} diff --git a/util/docker-compose/group_vars/all b/util/docker-compose/group_vars/all index ff3ed9de..d43d659d 100755 --- a/util/docker-compose/group_vars/all +++ b/util/docker-compose/group_vars/all @@ -62,7 +62,7 @@ distros_aarch64: kickstart: "default-aarch64.ks" aliase: "centos7" version: "centos" - iso_name: CentOS-7-aarch64-Minimal-1611 + iso_name: CentOS-7-aarch64-Minimal-1708 ppa_name: centos7-queens-ppa - cobbler_name: CentOS-7-Minimal-1611 + cobbler_name: CentOS-7-Minimal-1708 cobbler_arch: arm -- cgit 1.2.3-korg