From 71dec394b90d620458a51fc3200126693368e832 Mon Sep 17 00:00:00 2001
From: Simone Spinelli <simonei.spinelli@geant.org>
Date: Tue, 13 Dec 2022 11:56:43 +0000
Subject: [PATCH] Add role to deploy repositories, rename of playbooks
---
deploy_containerlab.yaml | 21 +++++++++++++
inventory.yml | 4 +--
roles/gap_repos/.travis.yml | 29 -----------------
roles/gap_repos/README.md | 38 ----------------------
roles/gap_repos/defaults/main.yml | 2 --
roles/gap_repos/handlers/main.yml | 2 --
roles/gap_repos/meta/main.yml | 52 -------------------------------
roles/gap_repos/tasks/main.yml | 40 ++++++++++++++++++------
roles/gap_repos/tests/inventory | 2 --
roles/gap_repos/tests/test.yml | 5 ---
roles/gap_repos/vars/main.yml | 2 --
11 files changed, 53 insertions(+), 144 deletions(-)
create mode 100644 deploy_containerlab.yaml
delete mode 100644 roles/gap_repos/.travis.yml
delete mode 100644 roles/gap_repos/README.md
delete mode 100644 roles/gap_repos/defaults/main.yml
delete mode 100644 roles/gap_repos/handlers/main.yml
delete mode 100644 roles/gap_repos/meta/main.yml
delete mode 100644 roles/gap_repos/tests/inventory
delete mode 100644 roles/gap_repos/tests/test.yml
delete mode 100644 roles/gap_repos/vars/main.yml
diff --git a/deploy_containerlab.yaml b/deploy_containerlab.yaml
new file mode 100644
index 0000000..bc48952
--- /dev/null
+++ b/deploy_containerlab.yaml
@@ -0,0 +1,21 @@
+- name: Sanity check
+ hosts: dev_environments
+ tasks:
+ - name: Ping them
+ ansible.builtin.ping:
+ - name: Show something
+ ansible.builtin.debug:
+ msg: blah blah
+
+- name: System Setup
+ hosts: dev_environments
+ become: true
+ roles:
+ - kvm
+ - containerlab
+ - dev_images
+
+- name: System Setup
+ hosts: dev_environments
+ roles:
+ - dev_networks
diff --git a/inventory.yml b/inventory.yml
index 54dc829..42b0550 100644
--- a/inventory.yml
+++ b/inventory.yml
@@ -1,5 +1,5 @@
dev_environments:
hosts:
test02:
- ansible_host: containerlab-test02
-
\ No newline at end of file
+ ansible_host: 172.16.100.9
+
diff --git a/roles/gap_repos/.travis.yml b/roles/gap_repos/.travis.yml
deleted file mode 100644
index 36bbf62..0000000
--- a/roles/gap_repos/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-language: python
-python: "2.7"
-
-# Use the new container infrastructure
-sudo: false
-
-# Install ansible
-addons:
- apt:
- packages:
- - python-pip
-
-install:
- # Install ansible
- - pip install ansible
-
- # Check ansible version
- - ansible --version
-
- # Create ansible.cfg with correct roles_path
- - printf '[defaults]\nroles_path=../' >ansible.cfg
-
-script:
- # Basic role syntax check
- - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
-
-notifications:
- webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/roles/gap_repos/README.md b/roles/gap_repos/README.md
deleted file mode 100644
index 225dd44..0000000
--- a/roles/gap_repos/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Role Name
-=========
-
-A brief description of the role goes here.
-
-Requirements
-------------
-
-Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
-
-Role Variables
---------------
-
-A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
-
-Dependencies
-------------
-
-A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
-
-Example Playbook
-----------------
-
-Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
-
- - hosts: servers
- roles:
- - { role: username.rolename, x: 42 }
-
-License
--------
-
-BSD
-
-Author Information
-------------------
-
-An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/gap_repos/defaults/main.yml b/roles/gap_repos/defaults/main.yml
deleted file mode 100644
index 1244601..0000000
--- a/roles/gap_repos/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# defaults file for gap_repos
diff --git a/roles/gap_repos/handlers/main.yml b/roles/gap_repos/handlers/main.yml
deleted file mode 100644
index 85108e0..0000000
--- a/roles/gap_repos/handlers/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# handlers file for gap_repos
diff --git a/roles/gap_repos/meta/main.yml b/roles/gap_repos/meta/main.yml
deleted file mode 100644
index c572acc..0000000
--- a/roles/gap_repos/meta/main.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-galaxy_info:
- author: your name
- description: your role description
- company: your company (optional)
-
- # If the issue tracker for your role is not on github, uncomment the
- # next line and provide a value
- # issue_tracker_url: http://example.com/issue/tracker
-
- # Choose a valid license ID from https://spdx.org - some suggested licenses:
- # - BSD-3-Clause (default)
- # - MIT
- # - GPL-2.0-or-later
- # - GPL-3.0-only
- # - Apache-2.0
- # - CC-BY-4.0
- license: license (GPL-2.0-or-later, MIT, etc)
-
- min_ansible_version: 2.1
-
- # If this a Container Enabled role, provide the minimum Ansible Container version.
- # min_ansible_container_version:
-
- #
- # Provide a list of supported platforms, and for each platform a list of versions.
- # If you don't wish to enumerate all versions for a particular platform, use 'all'.
- # To view available platforms and versions (or releases), visit:
- # https://galaxy.ansible.com/api/v1/platforms/
- #
- # platforms:
- # - name: Fedora
- # versions:
- # - all
- # - 25
- # - name: SomePlatform
- # versions:
- # - all
- # - 1.0
- # - 7
- # - 99.99
-
- galaxy_tags: []
- # List tags for your role here, one per line. A tag is a keyword that describes
- # and categorizes the role. Users find roles by searching for tags. Be sure to
- # remove the '[]' above, if you add tags to this list.
- #
- # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
- # Maximum 20 tags per role.
-
-dependencies: []
- # List your role dependencies here, one per line. Be sure to remove the '[]' above,
- # if you add dependencies to this list.
diff --git a/roles/gap_repos/tasks/main.yml b/roles/gap_repos/tasks/main.yml
index 2b89941..6faed74 100644
--- a/roles/gap_repos/tasks/main.yml
+++ b/roles/gap_repos/tasks/main.yml
@@ -1,17 +1,37 @@
---
# tasks file for gap_repos
-- name: Git checkout GAP test inventory
- ansible.builtin.git:
- repo: git@gitlab.geant.org:nat/gap_test_inventory.git
- dest: /var/tmp/inventory
- key_file: /home/simone/.ssh/id_rsa
- #version: release-0.22
- delegate_to: 127.0.0.1
+#
+#- name: Git clone GAP test inventory
+# shell: "git clone git@gitlab.geant.org:nat/gap_test_inventory.git /var/tmp/inventory"
+# delegate_to: localhost
+- name: Get the username running the deploy
+ become: false
+ local_action: command whoami
+ register: local_username
- name: Git checkout GAP Ansible repo
ansible.builtin.git:
repo: git@gitlab.geant.org:nat/uat_environment/lab_network_ansible.git
- dest: /var/tmp/ansible
- key_file: $HOME/.ssh/id_rsa
+ dest: /var/tmp/gap_ansible
#version: release-0.22
- delegate_to: 127.0.0.1
+ delegate_to: localhost
+ become_user: "{{ local_username.stdout }}"
+
+- name: Git checkout GAP reference topology
+ ansible.builtin.git:
+ repo: git@gitlab.geant.org:nat/cl-topologies/reference_topology.git
+ dest: /var/tmp/gap_reference_topology
+ clone: yes
+ #version: release-0.22
+ delegate_to: localhost
+ become_user: "{{ local_username.stdout }}"
+
+- name: Copy GAP on the target
+ ansible.builtin.copy:
+ src: /var/tmp/gap_ansible
+ dest: ~/gap_ansible
+
+- name: Copy GAP on the target
+ ansible.builtin.copy:
+ src: /var/tmp/gap_reference_topology
+ dest: ~/gap_reference_topology
diff --git a/roles/gap_repos/tests/inventory b/roles/gap_repos/tests/inventory
deleted file mode 100644
index 878877b..0000000
--- a/roles/gap_repos/tests/inventory
+++ /dev/null
@@ -1,2 +0,0 @@
-localhost
-
diff --git a/roles/gap_repos/tests/test.yml b/roles/gap_repos/tests/test.yml
deleted file mode 100644
index 67ea2ce..0000000
--- a/roles/gap_repos/tests/test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: localhost
- remote_user: root
- roles:
- - gap_repos
diff --git a/roles/gap_repos/vars/main.yml b/roles/gap_repos/vars/main.yml
deleted file mode 100644
index 04a6eb3..0000000
--- a/roles/gap_repos/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-# vars file for gap_repos
--
GitLab