Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop eodrh7 #369

Open
wants to merge 39 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
7fb13ad
commit EOD RHEL7
lel99999 May 3, 2019
5aba176
add dnf, upd MATE fix
lel99999 May 3, 2019
6453413
upd Vagrantfile and vagrant_hosts
lel99999 May 3, 2019
6d718cb
upd Epel install, fix errors
lel99999 May 3, 2019
c69980f
add files
lel99999 May 4, 2019
68ad31d
upd Vagrantfile, roles: eod7/epel7, role templates
lel99999 May 22, 2019
d08ff66
upd epel7,rm unnecessary lines
lel99999 May 22, 2019
3d8af78
rm debug line, template files
lel99999 May 22, 2019
fab9a76
revert to orig bin install location
lel99999 May 22, 2019
f66ffa2
Merge branch 'develop_eodrh7' of https://github.com/lel99999/aurora i…
stirlingv May 30, 2019
73225e7
merging EOD rh7 into deploy_research_environment.yml
stirlingv May 30, 2019
f412eaf
fix notify typo
lel99999 Jun 3, 2019
e0bf18b
Merge branch 'develop' of https://github.com/cfpb/aurora into eod_rh7
stirlingv Jun 4, 2019
95c1866
Merge branch 'develop_eodrh7' of https://github.com/lel99999/aurora i…
stirlingv Jun 4, 2019
272ef36
integrating rh7 EOD deployment to deploy_research.yml
stirlingv Jun 13, 2019
df43194
Merge pull request #1 from stirlingv/eod_rh7
lel99999 Jun 13, 2019
4886fff
changing eod hostname
stirlingv Nov 21, 2019
53fbe5e
typo
stirlingv Nov 21, 2019
46e1ec2
spacing issue
stirlingv Nov 21, 2019
dd1b579
Merge pull request #5 from stirlingv/develop_eodrh7
lel99999 Dec 17, 2019
1f6cc9a
updates to templates
stirlingv Dec 17, 2019
d28770d
removing reference to specific user
stirlingv Dec 17, 2019
51732db
Merge pull request #6 from stirlingv/develop_eodrh7
lel99999 Dec 17, 2019
5e127a6
upd common7
lel99999 Dec 18, 2019
cdfe50a
Merge branch 'develop_eodrh7' of https://github.com/lel99999/aurora i…
lel99999 Dec 18, 2019
b43ba71
adding emacs, and removing when condition
stirlingv Dec 18, 2019
3b45dda
Merge branch 'develop_eodrh7' of https://github.com/lel99999/aurora i…
stirlingv Dec 18, 2019
7a9cd8a
Merge pull request #7 from stirlingv/develop_eodrh7
lel99999 Dec 18, 2019
3ab247d
adding registered repos to eod deploy
stirlingv Dec 18, 2019
192d8de
Merge pull request #8 from stirlingv/develop_eodrh7
lel99999 Dec 18, 2019
749ef49
Update main.yaml
lel99999 Dec 18, 2019
3282429
upd host info Vagrantfile and deploy
lel99999 Jan 31, 2020
0dc0829
upd common7 role
lel99999 Jan 31, 2020
dcc5756
upd eod7 role
lel99999 Jan 31, 2020
a73ec11
add services conditional for RH7
lel99999 Jan 31, 2020
46da9cf
add -devel libraries, fixed templates iteritems -> items
lel99999 Jan 31, 2020
e93fdd6
upd vagrant_hosts for acceptable name
lel99999 Jan 31, 2020
df8fea2
Merge branch 'develop' into develop_eodrh7
tanderegg Mar 26, 2020
372373c
Merge branch 'develop' into develop_eodrh7
tanderegg Oct 13, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions deploy/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,25 @@ Vagrant.configure(2) do |config|
server.vm.network :private_network, ip: "10.0.1.19"
end

# Research EOD Redhat 7 server
config.vm.define :research_eodrh7 do |server|
server.vm.box = "clouddood/RH7.5_baserepo"
server.vm.host_name = "research-eodrh7.test.dev"

server.ssh.forward_agent = true

server.vm.provision "ansible" do |ansible|
ansible.playbook = "deploy_research_environment.yml"
ansible.inventory_path = "vagrant_hosts"
ansible.tags = ansible_tags
ansible.verbose = ansible_verbosity
ansible.extra_vars = ansible_extra_vars
ansible.limit = ansible_limit
end

server.vm.network :private_network, ip: "10.0.1.51"
end

# Research gauss server
config.vm.define :research_gauss do |server|
server.vm.box = "bento/centos-6.10"
Expand Down
25 changes: 21 additions & 4 deletions deploy/deploy_research_environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
become_method: sudo
roles:
- {role: iptables, when: "iptables_config"}
- common
- {role: epel, when: "use_epel and not 'production' in group_names"}
- emacs
- {role: common, when: "install_glusterfs and not rh7_upgrade"}
- {role: epel, when: "use_epel and not 'production' in group_names and not rh7_upgrade"}
- {role: emacs, when: "not rh7_upgrade"}
- jdk
- odbc
- postgresql-client
Expand Down Expand Up @@ -86,7 +86,23 @@
become_method: sudo
serial: 1
roles:
- eod
- {role: eod, when: not rh7_upgrade}

- hosts: research-eodrh7
become: yes
become_method: sudo
vars:
rh7_upgrade: true
roles:
- epel7
- common7
- eod7
- emacs
post_tasks:
- name: Install git
yum:
name: git
state: present

- hosts: research_gauss
become: yes
Expand Down Expand Up @@ -185,3 +201,4 @@
with_items:
- libicu
- libselinux-python

Binary file added deploy/files/ecs-13.8.9-linux-x64.bin
Binary file not shown.
21 changes: 21 additions & 0 deletions deploy/files/install_eod_server.exp
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#! /usr/bin/expect

# run the actual installer bin
# TODO: figure out where to put this
spawn /tmp/{{ eod_installer }}

# set a 2 minute timeout
set timeout 120

# set up your expects
expect_background {
"Enter directory to install Exceed Connection Server to" {
send "{{ eod_install_directory }}\r"
exp_continue
}
"Please press <Enter> to view License Agreement" {
exit 0
}
}
# interact return
expect eod
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lel99999 This file should go in the eod7 role right? Also, the binary file above should not be checked in, you'd have to download a copy locally and make sure the Ansible scripts have a variable you can use to point to the right place.

5 changes: 5 additions & 0 deletions deploy/group_vars/all/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -249,3 +249,8 @@ db_automation_package_state: present
#====================#
mesos_upgrade: False
marathon_upgrade: False

#======================#
### RedHat 7 Upgrade ###
#======================#
rh7_upgrade: False
Binary file added deploy/roles/common7/tasks/.main.yml.swo
Binary file not shown.
30 changes: 30 additions & 0 deletions deploy/roles/common7/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lel99999 The .swo file above should not be checked in.

- name: Install iptables-services
become: yes
become_method: sudo
# command: yum install -y iptables-services
yum:
name: iptables-services
state: present

- name: Make sure firewalld is masked
command: systemctl mask firewalld
# systemd:
# name: firewalld
# masked: yes

- name: Enable iptables services
# systemd:
# name: "{{ item }}"
# state: started
# enabled: yes
command: systemctl enable "{{ item }}"
with_items:
- iptables
- ip6tables

- name: start iptables services
command: systemctl start "{{ item }}"
with_items:
- iptables
- ip6tables
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lel99999 These commands should have a when statement to ensure they are only run when using Vagrant.

61 changes: 61 additions & 0 deletions deploy/roles/eod7/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---
#==================#
### EoD SETTINGS ###
#==================#
install_desktop: False
eod_restart: False
eod_install: True
eod_upgrade: False
#eod_installer: ecs-13.8.5-linux-x64.bin
eod_installer: ecs-13.8.9-linux-x64.bin
eod_upgrader:
eod_installer_directory: '/artifacts'
#eod_installer_directory: '/tmp'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lel99999 Remove all commented out lines please.

custom_repo: True
eod_prechannel_location: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/

eod_client_ports:
- 5500
- 8406
- 8407
- 6000:6025

eod_client_ports_udp:
- 177

eod_admins:
- vagrant
- admin

#restricted_group_name: vagrant
restricted_group_name: admin

eod_install_directory: '/usr/local/eod'
eod_cm_password: PASSWORD

# Define this variable to setup a cluster with a common datastore
# The datastore must be a shared volume accessible by all EOD nodes.
# eod_datastore_directory:

eod_datastore_password: PASSWORD
eod_cm_preferred_pcm: "{{ ansible_ssh_host }}"
eod_cluster_name: "{{ ansible_ssh_host }}"
xdmc_query_host: "{{ ansible_ssh_host }}"

eod_use_license_server: 0
eod_license_server_host:
eod_license_server_cache:

# TODO: you can put all the keys you want to here
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably want to put the actual eod_license _keys in aurora-internal repo behind CPFB enterprise GH

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

eod_license_keys:
- AAAA-BBBBBB-CCCCCC-DDDD-EEEEEE-FFF -0123456789 123

iptables_config: True
deploy_iptables: True
iptables_chain: TEST-INPUT
#iptables_chain: INPUT

install_eod: True
eod_restart: True

eod_greeter_include: false
18 changes: 18 additions & 0 deletions deploy/roles/eod7/handlers/main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
# TODO: fill this in

- name: restart eod
command: "{{ eod_install_directory }}/bin/otecs restart"
when: install_eod and eod_restart

- name: restart gdm
# shell: killall gdm-binary
# shell: systemctl restart display-manager
shell: systemctl restart gdm
ignore_errors: yes
when: eod_restart

#- name: restart prefdm
# shell: restart prefdm
# ignore_errors: yes
# when: eod_restart
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lel99999 Remove commented out lines

45 changes: 45 additions & 0 deletions deploy/roles/eod7/tasks/install_eod.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
---
- name: Copy over the EOD bin file
copy:
src: "{{ eod_installer_directory }}/{{ eod_installer }}"
dest: "/tmp/"
when: custom_repo
tags:
- eod

- name: Chmod EOD binary
file:
path: "/tmp/{{ eod_installer }}"
mode: a+x
when: custom_repo
tags:
- eod

- name: Ensure that eod directory exists
file:
path: "{{ eod_install_directory }}"
state: directory
tags:
- eod

- name: Copy the eod expect script
template:
src: files/install_eod_server.exp
dest: /tmp/install_eod_server.exp
mode: a+x
tags:
- eod

- name: run EOD expect script
shell: /tmp/install_eod_server.exp
when: custom_repo
tags:
- eod

- name: run eod silent install
shell: "{{ eod_install_directory }}/bin/install -s"
when: custom_repo
args:
creates: "{{ eod_install_directory }}/bin/otecs"
tags:
- eod
Loading