Merge pull request #70 from mandoonandy/master

Setup KSM on all nodes

ansible/deploy.yml

@@ -55,7 +55,7 @@
  tasks:
  - include: terraform/{{cloud}}/postboot.yml
 
-- hosts: db
+- hosts: primary
  any_errors_fatal: true
  become: yes
  become_method: sudo
@@ -82,6 +82,14 @@
  state: restarted
  when: mode == "deploy"
 
+- hosts: allsf
+ any_errors_fatal: true
+ become: yes
+ become_method: sudo
+ gather_facts: yes
+ connection: ssh
+
+ tasks:
  - name: Configure KSM to run on boot
  copy:
  content: |
@@ -135,37 +143,26 @@
  sysctl -w net.ipv6.conf.default.disable_ipv6=1
  ignore_errors: True
 
-- hosts: allsf
- any_errors_fatal: true
- become: yes
- become_method: sudo
- gather_facts: yes
- connection: ssh
- vars:
- release: git
- mode: deploy
-
- tasks:
- - name: Syslog server is DB server
+ - name: Syslog server is the primary server
  set_fact:
- syslog: "{{hostvars['localhost']['database_node_ip']}}"
+ syslog: "{{hostvars['localhost']['primary_node_ip']}}"
  when: mode == "deploy"
 
- - name: Send syslog to the DB server, unless I am the DB server
+ - name: Send syslog to the primary server, unless I am the primary server
  template:
  src: files/rsyslog-client-01-sf.conf
  dest: /etc/rsyslog.d/01-sf.conf
  owner: root
  group: sudo
  mode: u=r,g=r,o=
- when: hostvars['localhost']['database_node_ip'] != node_ip and mode == "deploy"
+ when: hostvars['localhost']['primary_node_ip'] != node_ip and mode == "deploy"
 
  - name: Restart syslog
  service:
  name: rsyslog
  enabled: yes
  state: restarted
- when: hostvars['localhost']['database_node_ip'] != node_ip and mode == "deploy"
+ when: hostvars['localhost']['primary_node_ip'] != node_ip and mode == "deploy"
 
  - name: Load default vars
  include_vars: main.yml
@@ -333,7 +330,7 @@
  mode: u=r,g=r,o=
  when: mode == "deploy"
 
-- hosts: db
+- hosts: primary
  any_errors_fatal: true
  become: yes
  become_method: sudo
@@ -546,7 +543,7 @@
  state: restarted
  daemon_reload: yes
 
-- hosts: db
+- hosts: primary
  roles:
  - role: andrewrothstein.terraform
  terraform_binary_dir: /usr/local/bin/terraform_install
@@ -555,7 +552,7 @@
  - role: andrewrothstein.go
  when: mode == "deploy"
 
-- hosts: db
+- hosts: primary
  any_errors_fatal: true
  become: yes
  become_method: sudo

ansible/hosts

@@ -1,12 +1,12 @@
 [local]
 localhost ansible_connection=local
 
-[db]
+[primary]
 
 [hypervisors]
 
 [allsf:children]
- db
+ primary
  hypervisors
 
 [allsf:vars]

ansible/includes/debian.yml

@@ -5,7 +5,7 @@
  upgrade: dist
  autoremove: yes
 
-- name: Install dependancies
+- name: Install dependencies
  apt:
  name: "{{ shakenfist_deps }}"
  state: latest

ansible/terraform/aws-single-node/postboot.yml

@@ -27,8 +27,8 @@
  delegate_to: localhost
  delegate_facts: true
 
-- name: Determine database node
+- name: Determine primary node
  set_fact:
- database_node_ip: "{{hostvars['sf-single']['node_ip']}}"
+ primary_node_ip: "{{hostvars['sf-single']['node_ip']}}"
  delegate_to: localhost
  delegate_facts: true

ansible/terraform/aws-single-node/terraform.yml

@@ -16,7 +16,7 @@
  ansible_ssh_host: "{{terraform_out.outputs.sf_single_external.value}}"
  ansible_user: "ubuntu"
  ansible_ssh_private_key_file: "~/.ssh/{{ssh_key_name}}.pem"
- groups: hypervisors, db, etcd_master
+ groups: hypervisors, primary, etcd_master
 
 - name: Add sf-single node_ip
  set_fact:

ansible/terraform/aws/postboot.yml

@@ -48,8 +48,8 @@
  delegate_to: localhost
  delegate_facts: true
 
-- name: Determine database node
+- name: Determine primary node
  set_fact:
- database_node_ip: "{{hostvars['sf-1']['node_ip']}}"
+ primary_node_ip: "{{hostvars['sf-1']['node_ip']}}"
  delegate_to: localhost
  delegate_facts: true

ansible/terraform/aws/terraform.yml

@@ -16,7 +16,7 @@
  ansible_ssh_host: "{{terraform_out.outputs.sf_1_external.value}}"
  ansible_user: "ubuntu"
  ansible_ssh_private_key_file: "~/.ssh/{{ssh_key_name}}.pem"
- groups: hypervisors, db, etcd_master
+ groups: hypervisors, primary, etcd_master
 
 - name: Add sf-1 node_ip
  set_fact:

ansible/terraform/gcp/postboot.yml

@@ -25,8 +25,8 @@
  delegate_to: localhost
  delegate_facts: true
 
-- name: Determine database node
+- name: Determine primary node
  set_fact:
- database_node_ip: "{{hostvars['sf-1']['node_ip']}}"
+ primary_node_ip: "{{hostvars['sf-1']['node_ip']}}"
  delegate_to: localhost
  delegate_facts: true

ansible/terraform/gcp/terraform.yml

@@ -12,7 +12,7 @@
  add_host:
  hostname: sf-1
  ansible_ssh_host: "{{terraform_out.outputs.sf_1_external.value[0]}}"
- groups: hypervisors, db, etcd_master
+ groups: hypervisors, primary, etcd_master
 
 - name: Add sf-1 node_ip
  set_fact:

ansible/terraform/metal/postboot.yml

@@ -25,8 +25,8 @@
  delegate_to: localhost
  delegate_facts: true
 
-- name: Determine database node
+- name: Determine primary node
  set_fact:
- database_node_ip: "{{hostvars['sf-1']['node_ip']}}"
+ primary_node_ip: "{{hostvars['sf-1']['node_ip']}}"
  delegate_to: localhost
  delegate_facts: true

ansible/terraform/metal/terraform.yml

@@ -4,7 +4,7 @@
  add_host:
  hostname: sf-1
  ansible_ssh_host: "{{metal_ip_sf1}}"
- groups: hypervisors, db, etcd_master
+ groups: hypervisors, primary, etcd_master
 
 - name: Add sf-1 node_ip
  set_fact:

ansible/terraform/openstack/postboot.yml

@@ -25,8 +25,8 @@
  delegate_to: localhost
  delegate_facts: true
 
-- name: Determine database node
+- name: Determine primary node
  set_fact:
- database_node_ip: "{{hostvars['sf-1']['node_ip']}}"
+ primary_node_ip: "{{hostvars['sf-1']['node_ip']}}"
  delegate_to: localhost
  delegate_facts: true

ansible/terraform/openstack/terraform.yml

@@ -15,7 +15,7 @@
  hostname: sf-1
  ansible_ssh_host: "{{terraform_out.outputs.sf_1_external.value}}"
  ansible_ssh_user: "ubuntu"
- groups: hypervisors, db, etcd_master
+ groups: hypervisors, primary, etcd_master
 
 - name: Add sf-1 node_ip
  set_fact:

ansible/terraform/shakenfist/postboot.yml

@@ -25,8 +25,8 @@
  delegate_to: localhost
  delegate_facts: true
 
-- name: Determine database node
+- name: Determine primary node
  set_fact:
- database_node_ip: "{{hostvars['sf-1']['node_ip']}}"
+ primary_node_ip: "{{hostvars['sf-1']['node_ip']}}"
  delegate_to: localhost
  delegate_facts: true

ansible/terraform/shakenfist/terraform.yml

@@ -14,7 +14,7 @@
  hostname: sf-1
  ansible_ssh_host: "{{terraform_out.outputs.sf_1_external.value}}"
  ansible_ssh_user: "ubuntu"
- groups: hypervisors, db, etcd_master
+ groups: hypervisors, primary, etcd_master
 
 - name: Add sf-1 node_ip
  set_fact: