renamed some hardware before going into metrics

basraven · Sep 14, 2020 · eb1a917 · eb1a917
1 parent d8d0449
commit eb1a917
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 22 deletions.
diff --git a/cicd/ansible/hosts.yml → cicd/ansible/1-cluster.yml b/cicd/ansible/hosts.yml → cicd/ansible/1-cluster.yml
@@ -20,20 +20,20 @@ all:
           ansible_user: basraven
           ansible_port: 22
         hosts:
-            linux-wayne:
-              #FIXME:  kerberos: server
-              ha_proxy_node_state: MASTER
-              ha_proxy_node_prio: 105
-              ha_proxy_node_interface: "enp3s0"
-              keepalived_peers: 192.168.5.2
-              ansible_host: 192.168.5.1
-              nfs_storage_capabilities:
-                - 111
-                - 211
-                - 221
-                - 112
-                - 212
-                - 222
+            # linux-wayne:
+            #   #FIXME:  kerberos: server
+            #   ha_proxy_node_state: MASTER
+            #   ha_proxy_node_prio: 105
+            #   ha_proxy_node_interface: "enp3s0"
+            #   keepalived_peers: 192.168.5.2
+            #   ansible_host: 192.168.5.1
+            #   nfs_storage_capabilities:
+            #     - 111
+            #     - 211
+            #     - 221
+            #     - 112
+            #     - 212
+            #     - 222
 
             50centos:
               kerberos: client

diff --git a/cicd/ansible/2-peripheral.yml b/cicd/ansible/2-peripheral.yml
@@ -0,0 +1,18 @@
+all:
+  hosts:
+  children:
+    virtual:
+        vars:
+          ansible_user: vagrant
+          ansible_ssh_pass: vagrant
+    metal:
+        vars:
+          ansible_user: basraven
+          ansible_port: 22
+        tags: helper
+        hosts:
+            50centos:
+              ansible_host: 192.168.5.2
+
+#[raspis:vars]
+#ansible_ssh_private_key_file=~/.ssh/id_rsa
diff --git a/cicd/jenkins/pipelines/ansible/Jenkinsfile b/cicd/jenkins/pipelines/ansible/Jenkinsfile
@@ -116,7 +116,7 @@ pipeline{
                     echo "#######################################################################"
                 }
                 lock(label: 'virtual', variable: 'LOCK_NAME', resource: null){
-                    ansiblePlaybook colorized: true, disableHostKeyChecking: true, installation: 'ansible', inventory: 'cicd/ansible/hosts.yml', extras: '--limit="virtual" ' + EXTRA_VARS, playbook: 'cicd/ansible/site.yml', tags: "${tags}"    
+                    ansiblePlaybook colorized: true, disableHostKeyChecking: true, installation: 'ansible', inventory: 'cicd/ansible/1-cluster.yml', extras: '--limit="virtual" ' + EXTRA_VARS, playbook: 'cicd/ansible/site.yml', tags: "${tags}"    
                 }
                 junit 'junit/site-*.xml' 
             }
@@ -154,7 +154,7 @@ pipeline{
                     echo "#######################################################################"
                 }
                 lock(label: 'metal', variable: 'LOCK_NAME', resource: null){
-                    ansiblePlaybook colorized: true, disableHostKeyChecking: true, installation: 'ansible', inventory: 'cicd/ansible/hosts.yml', extras: '--limit="metal" ' + EXTRA_VARS, playbook: 'cicd/ansible/site.yml', tags: "${tags}"    
+                    ansiblePlaybook colorized: true, disableHostKeyChecking: true, installation: 'ansible', inventory: 'cicd/ansible/1-cluster.yml', extras: '--limit="metal" ' + EXTRA_VARS, playbook: 'cicd/ansible/site.yml', tags: "${tags}"    
                 }
                 junit 'junit/site-*.xml' 
             }

diff --git a/documentation/src/content/docs/capability-architecture/_index.md b/documentation/src/content/docs/capability-architecture/_index.md
@@ -2,6 +2,7 @@
 title: Capability Architecture
 type: docs
 bookToc: false
+bookCollapseSection: true
 weight: 2
 ---
 

diff --git a/documentation/src/content/docs/technical-architecture/_index.md b/documentation/src/content/docs/technical-architecture/_index.md
@@ -2,7 +2,6 @@
 title: Technical Architecture
 type: docs
 bookToc: false
-bookCollapseSection : true
 weight: 3
 ---
 

diff --git a/...n/src/content/docs/technical-architecture/infrastructure-architecture/_index.md b/...n/src/content/docs/technical-architecture/infrastructure-architecture/_index.md
@@ -12,10 +12,12 @@ How all of this infrastructure is deployed can be found in [the deployment archi
 ### Server Inventory
 Currently the following servers are being used:
 
-| ID  | Hostname    | OS                     | Hardware Description          |
-| --- | ---         | ---                    | ---                           |
-| 1   | linux-wayne | Ubuntu server (latest) | Core i5 Desktop with SSD      |
-| 2   | 50centos    | CentOS 8               | Core i7 Laptop with HDD only  |
+| ID  | Hostname    | OS                     | Hardware Description          | Hardware Tier    |
+| --- | ---         | ---                    | ---                           | ---              |
+| 1   | linux-wayne | Ubuntu server (latest) | Core i5 Desktop with SSD      | 1 - cluster      |
+| 2   | 50centos    | CentOS 8               | Core i7 Laptop with HDD only  | 1 - cluster      |
+| 3   | ali-bell    | Raspbian               | Doorbell Raspberry Pi Zero    | 2 - periferal    |
+| 4   | kodi-e      | Raspbian               | Kodi Raspberry Pi 3b bedroom  | 2 - periferal    |
 
 ### Kubernetes (k8s)
 The majority of the applications are hosted through Kubernetes.

diff --git a/...ical-architecture/infrastructure-architecture/deployment-architecture/_index.md b/...ical-architecture/infrastructure-architecture/deployment-architecture/_index.md
@@ -18,7 +18,7 @@ Since there's always a need for installing packages on the nodes directly and I
 The goal here is to document every step, it does not matter how small, into an Ansible Playbook script.
 These Ansible scripts can be found on <https://github.com/basraven/la1r/ansible>
 
-#### Ansible Tags
+#### Ansible Technical Tags
 The following tags are used in Ansible:
 * helper                - Helper scripts for the run itself, e.g. to determine OS
 * hostname              - Set hostname of server