summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2018-06-13 06:29:25 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-13 06:29:25 +0000
commite94285f04a7560a2c5c68a1bc957d5fddf681c41 (patch)
treee9a42b3640946f7b17c0a1ed6b505dbf2699ef06
parent85eda35624cacbd473c097bc2638c2d874c01c07 (diff)
parent4c5ff9360854b833f54a25550a4463b7665de42f (diff)
Merge "build: fetch arm64 iso from opnfv artifacts site"
-rw-r--r--build/build-aarch64.yaml6
-rwxr-xr-xdeploy/compass_conf/os/centos7.3.aarch64.conf2
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/profile.tmpl3
-rwxr-xr-xdeploy/compass_conf/templates/cobbler/CentOS-7-Minimal-1708-arm-arm/system.tmpl76
-rwxr-xr-xutil/docker-compose/group_vars/all4
5 files changed, 85 insertions, 6 deletions
diff --git a/build/build-aarch64.yaml b/build/build-aarch64.yaml
index cccff29b..9ecb5f34 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