wip

ansible/inventories/host_vars/default

@@ -2,26 +2,19 @@
 # file: inventories/host_vars/default
 
 aws_access_key_id: "{{ lookup('env','ANSIBLE_AWS_ACCESS_KEY_ID') }}"
-aws_output_format: "{{ lookup('env','ANSIBLE_AWS_DEFAULT_OUTPUT') or 'json' }}"
+aws_output: "{{ lookup('env','ANSIBLE_AWS_DEFAULT_OUTPUT') or 'json' }}"
 aws_region: "{{ lookup('env','ANSIBLE_AWS_DEFAULT_REGION') or 'eu-west-1' }}"
 aws_secret_access_key: "{{ lookup('env','ANSIBLE_AWS_SECRET_ACCESS_KEY') }}"
-disks_additional_packages:
-- e2fsprogs-extra
-- nfs-utils
-hosts_enable_cloudinit: false
-hosts_enable_local: true
-hosts_enable_rc: true
-hosts_enable_zram: true
+disks_packages:
+- { "name": "e2fsprogs-extra", "state": "present" }
+- { "name": "nfs-utils", "state": "present" }
 hosts_git_repositories:
 - { "repo": "{{ lookup('env','ANSIBLE_GIT_REPOSITORY') }}", "dest": "{{ lookup('env','ANSIBLE_GIT_DIRECTORY') }}", "key_file": "{{ lookup('env','ANSIBLE_GIT_KEY_FILE') or '~/.ssh/id_rsa' }}", "version": "{{ lookup('env','ANSIBLE_GIT_VERSION') }}" }
 hosts_packages:
 - { "name": "ansible", "state": "present" }
-hosts_rc_functions:
-    - 10_prompt_set
-    - 10_ps1_set
-    - 30_pfetch
-    - 30_screen_attach
-    - 40_ssh_add
+hosts_services:
+- { "name": "local", "state": "started", "enabled": "yes" }
+- { "name": "zram", "state": "started", "enabled": "yes" }
 hosts_user_env:
 - ANSIBLE_AWS_ACCESS_KEY_ID
 - ANSIBLE_AWS_SECRET_ACCESS_KEY
@@ -38,3 +31,10 @@ hosts_user_env:
 - ANSIBLE_INVENTORY
 - ANSIBLE_PLAYBOOK
 - ENV
+hosts_user_rc_enable: true
+hosts_user_rc_functions:
+- { "path": "10_prompt_set", "state": "touch" }
+- { "path": "10_ps1_set", "state": "touch" }
+- { "path": "30_pfetch", "state": "touch" }
+- { "path": "30_screen_attach", "state": "touch" }
+- { "path": "40_ssh_add", "state": "touch" }

ansible/inventories/host_vars/localhost

@@ -1,20 +1,18 @@
 ---
 # file: inventories/host_vars/localhost
 
-disks_additional_disks:
-- disk: none
-  fstype: btrfs
-  mount: /var/lib/docker
-  service: docker
+disks_packages:
+- { "name": "btrfs-progs", "state": "present" }
+- { "name": "xfsprogs", "state": "present" }
 docker_image_tag: "{{ lookup('env','ANSIBLE_DOCKER_IMAGE_TAG') or 'latest' }}"
 docker_registry: "{{ lookup('env','ANSIBLE_DOCKER_REGISTRY') }}"
-hosts_enable_local: true
-hosts_enable_rc: true
-hosts_enable_zram: true
 hosts_git_repositories:
 - { "repo": "{{ lookup('env','ANSIBLE_GIT_REPOSITORY') }}", "dest": "{{ lookup('env','ANSIBLE_GIT_DIRECTORY') }}", "key_file": "{{ lookup('env','ANSIBLE_GIT_KEY_FILE') or '~/.ssh/id_rsa' }}", "version": "{{ lookup('env','ANSIBLE_GIT_VERSION') }}" }
 hosts_packages:
 - { "name": "ansible", "state": "present" }
+hosts_services:
+- { "name": "local", "state": "started", "enabled": "yes" }
+- { "name": "zram", "state": "started", "enabled": "yes" }
 hosts_user_env:
 - ANSIBLE_CONFIG
 - ANSIBLE_DOCKER_IMAGE_TAG
@@ -26,3 +24,4 @@ hosts_user_env:
 - ANSIBLE_INVENTORY
 - ANSIBLE_PLAYBOOK
 - ENV
+hosts_user_rc_enable: true

ansible/inventories/host_vars/myos

@@ -2,10 +2,10 @@
 # file: inventories/host_vars/myos
 
 aws_access_key_id: "{{ lookup('env','ANSIBLE_AWS_ACCESS_KEY_ID') }}"
-aws_output_format: "{{ lookup('env','ANSIBLE_AWS_DEFAULT_OUTPUT') or 'json' }}"
+aws_output: "{{ lookup('env','ANSIBLE_AWS_DEFAULT_OUTPUT') or 'json' }}"
 aws_region: "{{ lookup('env','ANSIBLE_AWS_DEFAULT_REGION') or 'eu-west-1' }}"
 aws_secret_access_key: "{{ lookup('env','ANSIBLE_AWS_SECRET_ACCESS_KEY') }}"
-disks_additional_disks:
+disks_to_mount:
 - disk: /dev/xvdb
   disable_periodic_fsck: true
   fstype: ext4
@@ -16,21 +16,15 @@ disks_additional_disks:
   fstype: nfs
   mount_options: "{{ lookup('env','ANSIBLE_DISKS_NFS_OPTIONS') }}"
   mount: "{{ lookup('env','ANSIBLE_DISKS_NFS_PATH') }}"
-disks_additional_services:
-- rpc.statd
+disks_services:
+- { "name": "rpc.statd", "state": "started", "enabled": "yes" }
 docker_image_tag: "{{ lookup('env','ANSIBLE_DOCKER_IMAGE_TAG') or 'latest' }}"
 docker_registry: "{{ lookup('env','ANSIBLE_DOCKER_REGISTRY') }}"
-hosts_enable_local: true
-hosts_enable_rc: true
-hosts_enable_zram: true
 hosts_packages:
 - { "name": "ansible", "state": "present" }
-hosts_rc_functions:
-    - 10_prompt_set
-    - 10_ps1_set
-    - 30_pfetch
-    - 30_screen_attach
-    - 40_ssh_add
+hosts_services:
+- { "name": "local", "state": "started", "enabled": "yes" }
+- { "name": "zram", "state": "started", "enabled": "yes" }
 hosts_user_env:
 - ANSIBLE_AWS_ACCESS_KEY_ID
 - ANSIBLE_AWS_SECRET_ACCESS_KEY
@@ -47,3 +41,10 @@ hosts_user_env:
 - ANSIBLE_INVENTORY
 - ANSIBLE_PLAYBOOK
 - ENV
+hosts_user_rc_enable: true
+hosts_user_rc_functions:
+- { "path": "10_prompt_set", "state": "touch" }
+- { "path": "10_ps1_set", "state": "touch" }
+- { "path": "30_pfetch", "state": "touch" }
+- { "path": "30_screen_attach", "state": "touch" }
+- { "path": "40_ssh_add", "state": "touch" }