diff options
Diffstat (limited to 'util/docker-compose')
5 files changed, 33 insertions, 21 deletions
diff --git a/util/docker-compose/group_vars/all b/util/docker-compose/group_vars/all index 920589ce..d43d659d 100755 --- a/util/docker-compose/group_vars/all +++ b/util/docker-compose/group_vars/all @@ -29,7 +29,7 @@ distros_x86_64: aliase: "xenial" version: "ubuntu" iso_name: ubuntu-16.04.3-server-amd64 - ppa_name: xenial-pike-ppa + ppa_name: xenial-queens-ppa cobbler_name: ubuntu-16.04.3-server cobbler_arch: x86_64 @@ -39,21 +39,21 @@ distros_x86_64: aliase: "centos7" version: "centos" iso_name: CentOS-7-x86_64-Minimal-1708 - ppa_name: centos7-pike-ppa + ppa_name: centos7-queens-ppa cobbler_name: CentOS-7-Minimal-1708 cobbler_arch: 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" iso_name: ubuntu-16.04-server-arm64 - ppa_name: xenial-pike-ppa + ppa_name: xenial-queens-ppa cobbler_name: ubuntu-16.04-server cobbler_arch: arm @@ -62,7 +62,7 @@ distros_aarch64: kickstart: "default-aarch64.ks" aliase: "centos7" version: "centos" - iso_name: CentOS-7-aarch64-Minimal-1611 - ppa_name: centos7-pike-ppa - cobbler_name: CentOS-7-Minimal-1611 + iso_name: CentOS-7-aarch64-Minimal-1708 + ppa_name: centos7-queens-ppa + cobbler_name: CentOS-7-Minimal-1708 cobbler_arch: arm 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 diff --git a/util/docker-compose/roles/compass/files/prepare_ansible.sh b/util/docker-compose/roles/compass/files/prepare_ansible.sh index 031333c8..22b7e905 100755 --- a/util/docker-compose/roles/compass/files/prepare_ansible.sh +++ b/util/docker-compose/roles/compass/files/prepare_ansible.sh @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + #!/bin/bash for i in `ls /root/compass4nfv/deploy/adapters/ansible | grep "openstack_"`; do diff --git a/util/docker-compose/roles/compass/files/up_containers.sh b/util/docker-compose/roles/compass/files/up_containers.sh index 9aca591a..6a57282e 100755 --- a/util/docker-compose/roles/compass/files/up_containers.sh +++ b/util/docker-compose/roles/compass/files/up_containers.sh @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + #!/bin/bash cd /root/docker_compose docker-compose up diff --git a/util/docker-compose/roles/machines/tasks/main.yml b/util/docker-compose/roles/machines/tasks/main.yml index 365a9d90..7b4a9f18 100755 --- a/util/docker-compose/roles/machines/tasks/main.yml +++ b/util/docker-compose/roles/machines/tasks/main.yml @@ -1,21 +1,15 @@ --- -- name: create switch file if test mode enabled - template: src=switch_machines_file.j2 - dest="{{ docker_compose_dir }}/switch_machines_file" - tags: - - redploy - - name: docker cp switch_machines_file shell: | - docker cp "{{ docker_compose_dir }}/switch_machines_file" \ - compass-deck:/tmp/switch_machines_file + docker cp "{{ docker_compose_dir }}/machine" \ + compass-deck:/tmp/machine tags: - redploy - name: inject switches and mac addresses shell: | docker exec compass-deck bash -c \ - "/opt/compass/bin/manage_db.py set_switch_machines \ - --switch_machines_file /tmp/switch_machines_file" + "/opt/compass/bin/manage_db.py set_machine \ + --machine_file /tmp/machine" tags: - redploy |