diff --git a/Vagrantfile b/Vagrantfile index b0086b3..0134126 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -12,7 +12,6 @@ MEMORY = ENV.fetch("VM_SIZE", "8192").to_i # Every Vagrant development environment requires a box. You can search for # boxes at https://vagrantcloud.com/search. -# BOX = ENV.fetch("VM_BOX", "generic/centos8") BOX = ENV.fetch("VM_BOX", "generic/ubuntu2204") # Machine host name diff --git a/playbooks/devstack/pre.yaml b/playbooks/devstack/pre.yaml index 3687f39..55b62cc 100644 --- a/playbooks/devstack/pre.yaml +++ b/playbooks/devstack/pre.yaml @@ -12,6 +12,5 @@ - hosts: all roles: - - {role: devstack-tobiko-centos, when: ansible_distribution == 'CentOS'} - role: multi-node-setup - role: orchestrate-devstack diff --git a/roles/devstack-tobiko-vagrant/tasks/main.yaml b/roles/devstack-tobiko-vagrant/tasks/main.yaml index a482a94..f8d64c9 100644 --- a/roles/devstack-tobiko-vagrant/tasks/main.yaml +++ b/roles/devstack-tobiko-vagrant/tasks/main.yaml @@ -16,18 +16,3 @@ become: true when: - ansible_os_family == 'Debian' - -- become: true - when: - - ansible_distribution == "CentOS" - - ansible_distribution_major_version == "8" - block: - - name: Switch from CentOS Linux repos to Centos Stream repos - command: dnf -y swap centos-linux-repos centos-stream-repos - args: - warn: false - - - name: Switch packages from CentOS Linux to to Centos Stream - command: dnf -y distro-sync - args: - warn: false diff --git a/zuul.d/devstack-tobiko-centos.yaml b/zuul.d/devstack-tobiko-centos.yaml deleted file mode 100644 index 05f02db..0000000 --- a/zuul.d/devstack-tobiko-centos.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- - -- project-template: - name: devstack-tobiko-centos - description: CentOS Devstack Tobiko Plugin job - check: &CHECK - jobs: - - devstack-tobiko-centos - periodic: *CHECK - - -# --- Minimal jobs ----------------------------------------------------------- - -- job: - abstract: false - name: devstack-tobiko-centos - parent: devstack-tobiko-minimal - nodeset: devstack-tobiko-centos - voting: false - description: CentOS Devstack Tobiko Plugin job diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml index 3906e10..c6e6713 100644 --- a/zuul.d/nodesets.yaml +++ b/zuul.d/nodesets.yaml @@ -20,14 +20,6 @@ groups: *STANDALONE_GROUPS -- nodeset: - name: devstack-tobiko-centos - nodes: - - name: controller - label: nested-virt-centos-9-stream - groups: *STANDALONE_GROUPS - - # --- MULTINODE -------------------------------------------------------------- - nodeset: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 0af8e3a..ac481d2 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -4,7 +4,6 @@ templates: - ansible-role-jobs - devstack-tobiko - - devstack-tobiko-centos - devstack-tobiko-designate - devstack-tobiko-functional - devstack-tobiko-heat