#1 Integrate the koji-playbooks repo as a git submodule and misc fixes
Merged 3 months ago by pingou. Opened 3 months ago by nphilipp.

file added
+3

@@ -0,0 +1,3 @@ 

+ [submodule "koji-playbooks"]

+ 	path = koji-playbooks

+ 	url = https://github.com/ktdreyer/koji-playbooks.git

file modified
+6 -19

@@ -2,30 +2,17 @@ 

  ============

  

  This project hosts a Vagrantfile meant to make it easy to deploy koji in a local

- VM for development purpose.

+ VM for development purposes.

  

- It relies on the playbook provided at: https://github.com/ktdreyer/koji-playbooks

- which should be cloned in the same folder as this project.

+ It relies on Ken Dreyer's Ansible playbooks for Koji provided at:

+ https://github.com/ktdreyer/koji-playbooks

  

  To run the project::

  

-     git clone git@github.com:ktdreyer/koji-playbooks.git

      git clone ssh://git@pagure.io/koji-vagrant.git

- 

- Edit the playbook to specify that ansible should be ran using python3::

- 

-     vim koji-playbooks/setup-koji.yml

- 

- And adjust it to::

- 

-    - name: manage Koji VM

-      hosts: all

-      vars:

-        ansible_python_interpreter: /usr/bin/python3

- 

- Then move to the koji-vagrant project::

- 

      cd koji-vagrant

+     git submodule init

+     git submodule update

  

  Create the SSL certs needed by koji::

  

@@ -36,7 +23,7 @@ 

  

  Move the SSL certs into there expected location::

  

-     cp koji-ca.* kojidev.example.com.* ../koji-playbooks/roles/koji-hub/files

+     cp koji-ca.* kojidev.example.com.* koji-playbooks/roles/koji-hub/files

  

  Start the VM::

  

file modified
+6 -5

@@ -6,9 +6,9 @@ 

  VAGRANTFILE_API_VERSION = "2"

  

  Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

-  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-30-1.2.x86_64.vagrant-libvirt.box"

-  config.vm.box = "f30-cloud-libvirt"

-  config.vm.box_download_checksum = "2ae5aad7621ce7735c905bf6b882d391949f8bfa3534b8631c9b2161126ca2f0"

+  config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-31-1.9.x86_64.vagrant-libvirt.box"

+  config.vm.box = "f31-cloud-libvirt"

+  config.vm.box_download_checksum = "c0b34a1a81f6d43b8b0261016fb4354c6a2a5895569dddf0da13286e3759237d"

   config.vm.box_download_checksum_type = "sha256"

  

   # Forward traffic on the host to the development server on the guest.

@@ -41,13 +41,14 @@ 

  

   # bootstrap and run with ansible

   config.vm.provision "ansible" do |ansible|

-      ansible.playbook = "../koji-playbooks/setup-koji.yml"

+      ansible.compatibility_mode = "2.0"

+      ansible.playbook = "koji-playbooks/setup-koji.yml"

   end

  

  

   # Create the kojii dev box

   config.vm.define "koji" do |koji|

-     koji.vm.host_name = "kojidev.example.com"

+     koji.vm.hostname = "kojidev.example.com"

  

      koji.vm.provider :libvirt do |domain|

          # Season to taste

file renamed
+ -
@@ -0,0 +1,1 @@ 
+ Subproject commit 05223aea46b6274d4e0589fce750d8139e3465fc

... e.g. use F31 as base (where Ansible uses Python 3 by default).

I could rebuild the VM fine using this and systemctl --failed show the same issue, so I think this change doesn't make things worst on that point.

The only thing we may want to do is add koji-playbooks to the .gitignore file

The only thing we may want to do is add koji-playbooks to the .gitignore file

Apparently this doesn't change anything, so nevermind

Let's merge! :)

Pull-Request has been merged by pingou

3 months ago