Merge branch 'master' of ssh://gerrit.opencord.org:29418/cord
diff --git a/ansible/host_vars/10.100.198.200 b/ansible/host_vars/10.100.198.200
index 48505cb..d498068 100644
--- a/ansible/host_vars/10.100.198.200
+++ b/ansible/host_vars/10.100.198.200
@@ -1 +1 @@
-ansible_ssh_private_key_file: /opencord/.vagrant/machines/cd/virtualbox/private_key
+ansible_ssh_private_key_file: /opencord/.vagrant/machines/corddev/virtualbox/private_key
diff --git a/ansible/host_vars/10.100.198.201 b/ansible/host_vars/10.100.198.201
new file mode 100644
index 0000000..d7d2822
--- /dev/null
+++ b/ansible/host_vars/10.100.198.201
@@ -0,0 +1 @@
+ansible_ssh_private_key_file: /opencord/.vagrant/machines/prod/virtualbox/private_key
diff --git a/ansible/hosts/prod b/ansible/hosts/prod
new file mode 100644
index 0000000..66da1c1
--- /dev/null
+++ b/ansible/hosts/prod
@@ -0,0 +1,6 @@
+[jenkins-node]
+10.100.198.200
+10.100.198.201
+
+[prod]
+10.100.198.201 consul_extra="-server -bootstrap -ui"
diff --git a/ansible/prodseed.yml b/ansible/prodseed.yml
new file mode 100644
index 0000000..6e2a517
--- /dev/null
+++ b/ansible/prodseed.yml
@@ -0,0 +1,10 @@
+- hosts: prod
+ remote_user: vagrant
+ serial: 1
+ roles:
+ - common
+ - docker
+ - docker-compose
+ - consul-template
+ - registry
+ - java8-oracle
diff --git a/ansible/roles/common/defaults/main.yml b/ansible/roles/common/defaults/main.yml
index 4ccfffb..818be64 100644
--- a/ansible/roles/common/defaults/main.yml
+++ b/ansible/roles/common/defaults/main.yml
@@ -3,6 +3,11 @@
{ host_ip: "10.100.198.201", host_name: "prod"},
]
+use_latest_for:
+ - debian-keyring
+ - debian-archive-keyring
+ - rng-tools
+
obsolete_services:
- puppet
- chef-client
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
index 32b60e8..72441b6 100644
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@@ -12,6 +12,12 @@
with_items: hosts
tags: [common]
+- name: Latest apt packages
+ apt:
+ name: "{{ item }}"
+ with_items: use_latest_for
+ tags: [common]
+
- name: Services are not running
service:
name: "{{ item }}"
diff --git a/ansible/roles/java/tasks/main.yml b/ansible/roles/java/tasks/main.yml
new file mode 100644
index 0000000..beb4211
--- /dev/null
+++ b/ansible/roles/java/tasks/main.yml
@@ -0,0 +1,5 @@
+- name: Package is present
+ apt:
+ name=openjdk-7-jdk
+ state=present
+ tags: [java]