From a45a643ab6db2bf9d3b20bea7a684dfb12ff3e98 Mon Sep 17 00:00:00 2001 From: Nikolay Fedorov Date: Fri, 16 Jul 2021 10:40:13 +0000 Subject: [PATCH] Move to Rocky Linux --- etc/kayobe/compute.yml | 2 +- etc/kayobe/controllers.yml | 2 +- etc/kayobe/dnf.yml | 4 ++-- etc/kayobe/kolla/config/bifrost/bifrost.yml | 2 +- etc/kayobe/kolla/globals.yml | 14 ++++++++++++++ etc/kayobe/seed-vm.yml | 3 +-- etc/kayobe/seed.yml | 2 +- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml index 200d4fc..10cea8f 100644 --- a/etc/kayobe/compute.yml +++ b/etc/kayobe/compute.yml @@ -4,7 +4,7 @@ # User with which to access the computes via SSH during bootstrap, in order # to setup the Kayobe user account. -compute_bootstrap_user: centos +compute_bootstrap_user: rocky ############################################################################### # Compute network interface configuration. diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml index 994aa42..44177ce 100644 --- a/etc/kayobe/controllers.yml +++ b/etc/kayobe/controllers.yml @@ -4,7 +4,7 @@ # User with which to access the controllers via SSH during bootstrap, in order # to setup the Kayobe user account. -controller_bootstrap_user: centos +controller_bootstrap_user: rocky ############################################################################### # Controller network interface configuration. diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml index cf09b86..ddf6f30 100644 --- a/etc/kayobe/dnf.yml +++ b/etc/kayobe/dnf.yml @@ -13,10 +13,10 @@ #dnf_use_local_mirror: # Mirror FQDN for Yum repos. Default value is 'mirror.centos.org'. -#dnf_centos_mirror_host: +dnf_centos_mirror_host: mirror.yandex.ru # Mirror directory for Yum CentOS repos. Default value is 'centos'. -#dnf_centos_mirror_directory: +dnf_centos_mirror_directory: rockylinux # Mirror FQDN for Yum EPEL repos. Default value is # 'download.fedoraproject.org'. diff --git a/etc/kayobe/kolla/config/bifrost/bifrost.yml b/etc/kayobe/kolla/config/bifrost/bifrost.yml index c849966..16a80c1 100644 --- a/etc/kayobe/kolla/config/bifrost/bifrost.yml +++ b/etc/kayobe/kolla/config/bifrost/bifrost.yml @@ -8,5 +8,5 @@ use_cirros: true {% if os_distribution == 'ubuntu' %} cirros_deploy_image_upstream_url: "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img" {% else %} -cirros_deploy_image_upstream_url: "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.4.2105-20210603.0.x86_64.qcow2" +cirros_deploy_image_upstream_url: "https://download.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud-8.4-20210620.0.x86_64.qcow2" {% endif %} diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 0e91596..53183ff 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -17,3 +17,17 @@ docker_disable_default_iptables_rules: true # - controller2 glance_backend_file: "yes" glance_file_datadir_volume: /var/glance +docker_yum_url: "https://download.docker.com/linux/centos" + +host_os_distributions: + CentOS: + - "8" + Debian: + - "buster" + RHEL: + - "8" + Ubuntu: + - "bionic" + - "focal" + Rocky: + - "8" diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml index 3c5d93c..d3a7805 100644 --- a/etc/kayobe/seed-vm.yml +++ b/etc/kayobe/seed-vm.yml @@ -26,8 +26,7 @@ seed_vm_vcpus: 1 #seed_vm_root_format: # Base image for the seed VM root volume. Default is -# "https://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.2.2004-20200611.2.x86_64.qcow2". -#seed_vm_root_image: +seed_vm_root_image: "https://download.rockylinux.org/pub/rocky/8/images/Rocky-8-GenericCloud-8.4-20210620.0.x86_64.qcow2" # Capacity of the seed VM data volume. #seed_vm_data_capacity: diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index 7a4b007..be7bb09 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -4,7 +4,7 @@ # User with which to access the seed via SSH during bootstrap, in order to # setup the Kayobe user account. -seed_bootstrap_user: centos +seed_bootstrap_user: rocky ############################################################################### # Seed network interface configuration.