Merge pull request #9 from queeno/revamp_ansible_uchiwa

queeno · web-flow · commit 4a397b89cd5c · 2020-02-06T14:39:07.000+01:00
Revamp repository with latest updates
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 /.vagrant/
 *.swp
+.idea/
+*.log
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,13 @@
 ---
 language: python
-python: "2.7"
+python: "3.7"
 
 before_install:
   - sudo apt-get update -qq
 
 install:
   # Install Ansible.
-  - pip install ansible==1.9.2
+  - pip3 install ansible==2.9.3
 
   # Create an inventory file for testing.
   - "echo 'uchiwa-standalone ansible_ssh_host=localhost' > inventory"
@@ -17,4 +17,4 @@ script:
   - "ansible-playbook -i inventory vagrant/site.yml --syntax-check"
 
   # Run the playbook
-  - "ansible-playbook -vvvv -i inventory vagrant/site.yml --connection=local --sudo"
+  - "ansible-playbook -vvvv -i inventory vagrant/site.yml --connection=local"
diff --git a/README.md b/README.md
@@ -37,11 +37,11 @@ These variables are defined in `defaults/main.yml`. Please overwrite if you have
 |-----------------------------|-----------------|----------------------------------------------|--------------------------------|
 |`supported_os_families`      |List of strings  |Supported OS families by the role             |['Debian','RedHat']             |
 |`install_repo`               |Boolean          |Determines whether to install sensu repo      |True                            |
-|`sensu_apt_repo_url`         |String           |Sensu APT repository URL                      |'http://repos.sensuapp.org/apt' |
-|`sensu_apt_repo_distribution`|String           |Sensu APT repository distribution             |'sensu'                         |
+|`sensu_apt_repo_url`         |String           |Sensu APT repository URL                      |'https://sensu.global.ssl.fastly.net/apt' |
+|`sensu_apt_repo_distribution`|String           |Sensu APT repository distribution             |'{{ ansible_distribution_release }}'                         |
 |`sensu_apt_repo`             |String           |Sensu APT repository name                     |'main'                          |
 |`sensu_apt_repo_key_url`     |String           |Sensu APT repository key URL                  |Please see <sup>1</sup>|
-|`sensu_apt_repo_key_id`      |String           |Sensu APT repository key ID                   |'7580C77F'                      |
+|`sensu_apt_repo_key_id`      |String           |Sensu APT repository key ID                   |'EB9C94BB'                      |
 |`sensu_yum_repo`             |String           |Determines which YUM sensu repo to install <sup>2</sup> |'sensu'                         |
 |`version`                    |String           |Determines the uchiwa version to install <sup>3</sup> |'installed'                     |
 |`uchiwa_apt_pkg`             |String           |The uchiwa package name for Debian systems    |'uchiwa'                        |
@@ -132,8 +132,8 @@ The `vagrant up` command will trigger a `standalone.yml` ansible-playbook run th
 
 You can also spin up a specific vm:
 
-`vagrant up debian` spins up *hashicorp/precise64*
-`vagrant up redhat` spins up *chef/centos-6.5*
+`vagrant up debian` spins up *ubuntu/xenial64*
+`vagrant up redhat` spins up *bento/centos-8*
 
 ### Acceptance Tests
 
diff --git a/Vagrantfile b/Vagrantfile
@@ -1,12 +1,12 @@
 machines = {
   'debian'  =>  {
                   'ip'          => '192.168.33.2',
-                  'box'         => 'ubuntu/trusty64',
+                  'box'         => 'ubuntu/xenial64',
                   'local_port'  => '8080',
                 },
   'redhat'  =>  {
                   'ip'          => '192.168.33.3',
-                  'box'         => 'bento/centos-7.1',
+                  'box'         => 'bento/centos-8',
                   'local_port'  => '8081',
                 }
 }
@@ -26,7 +26,6 @@ Vagrant.configure('2') do |config|
           'redhat' => ['redhat-standalone']
         }
         ansible.limit = "#{vm}"
-        ansible.sudo = true
         ansible.host_key_checking = false
       end
     end
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -10,10 +10,10 @@ supported_os_families:
 install_repo: true
 
 # The sensu APT repo params
-sensu_apt_repo_url: 'http://repositories.sensuapp.org/apt'
-sensu_apt_repo_distribution: sensu
+sensu_apt_repo_url: 'https://sensu.global.ssl.fastly.net/apt'
+sensu_apt_repo_distribution: "{{ ansible_distribution_release }}"
 sensu_apt_repo: main
-sensu_apt_repo_key_url: 'http://repositories.sensuapp.org/apt/pubkey.gpg'
+sensu_apt_repo_key_url: 'https://sensu.global.ssl.fastly.net/apt/pubkey.gpg'
 sensu_apt_repo_key_id: EB9C94BB
 
 # The sensu YUM repo params
diff --git a/files/sensu-unstable.repo b/files/sensu-unstable.repo
diff --git a/files/sensu.repo b/files/sensu.repo
@@ -1,5 +1,5 @@
 [sensu]
-name=sensu-main
-baseurl=http://repositories.sensuapp.org/yum/$releasever/$basearch/
+name=sensu
+baseurl=https://sensu.global.ssl.fastly.net/yum/7/$basearch/
 gpgcheck=0
-enabled=1
+enabled=1
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -2,4 +2,6 @@
 ---
 
 - name: restart uchiwa
-  service: name=uchiwa state=restarted
+  systemd:
+    state: restarted
+    name: uchiwa
diff --git a/meta/main.yml b/meta/main.yml
@@ -58,11 +58,7 @@ galaxy_info:
   #  - maverick
   #  - natty
   #  - oneiric
-    - precise
-    - quantal
-    - raring
-    - saucy
-    - trusty
+    - xenial
   #- name: SLES
   #  versions:
   #  - all
@@ -82,8 +78,8 @@ galaxy_info:
   #  - etch
   #  - lenny
   #  - squeeze
-    - wheezy
-    - jessie
+    - buster
+
   #
   # Below are all categories currently available. Just as with
   # the platforms above, uncomment those that apply to your role.
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -8,14 +8,14 @@
 
 # Install sensu/uchiwa repo
 - name: Install sensu apt repo
-  include: repo/apt.yml
+  import_tasks: repo/apt.yml
   when: install_repo and ansible_os_family == 'Debian'
 
-- include: repo/yum.yml
+- import_tasks: repo/yum.yml
   when: install_repo and ansible_os_family == 'RedHat'
 
 # Install uchiwa
-- include: install.yml
+- import_tasks: install.yml
 
 # Configure uchiwa
-- include: config.yml
+- import_tasks: config.yml
diff --git a/tasks/repo/yum.yml b/tasks/repo/yum.yml
@@ -1,6 +1,6 @@
 ---
 
-- include: ../redhat/selinux.yml
+- import_tasks: ../redhat/selinux.yml
   when: not ansible_selinux
 
 - name: Add the official sensu repository
diff --git a/vagrant/site.yml b/vagrant/site.yml
@@ -1,2 +1,2 @@
 ---
-- include: standalone.yml
+- import_playbook: standalone.yml
diff --git a/vagrant/standalone.yml b/vagrant/standalone.yml
@@ -1,6 +1,7 @@
 # Default playbook to install uchiwa on vanilla box
 
 - hosts: all
+  become: true
   roles:
     - role: uchiwa
 

-Original file line number
+Diff line change
 /.vagrant/
 *.swp
 +.idea/
 +*.log
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-- include: standalone.yml`
	`2`	`+- import_playbook: standalone.yml`