summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/aws_command.rb2
-rw-r--r--playbooks/aws/ansible-tower/config.yml5
-rw-r--r--playbooks/aws/ansible-tower/launch.yml26
-rw-r--r--playbooks/aws/ansible-tower/vars.ops.yml (renamed from playbooks/aws/ansible-tower/vars.ops)0
-rw-r--r--roles/ansible_install/tasks/main.yaml7
-rw-r--r--roles/base_os/tasks/main.yaml5
-rw-r--r--roles/ipv6_disable/tasks/main.yaml11
7 files changed, 43 insertions, 13 deletions
diff --git a/lib/aws_command.rb b/lib/aws_command.rb
index 1c3efc91c..7c6872c64 100644
--- a/lib/aws_command.rb
+++ b/lib/aws_command.rb
@@ -7,7 +7,7 @@ module OpenShift
module Ops
class AwsCommand < Thor
# WARNING: we do not currently support environments with hyphens in the name
- SUPPORTED_ENVS = %w(prod stg int tint kint test jint amint tdint lint)
+ SUPPORTED_ENVS = %w(prod stg int ops tint kint test jint amint tdint lint)
option :type, :required => true, :enum => LaunchHelper.get_aws_host_types,
:desc => 'The host type of the new instances.'
diff --git a/playbooks/aws/ansible-tower/config.yml b/playbooks/aws/ansible-tower/config.yml
index 0124156a9..069a7b7b1 100644
--- a/playbooks/aws/ansible-tower/config.yml
+++ b/playbooks/aws/ansible-tower/config.yml
@@ -16,5 +16,6 @@
- vars.yml
- "vars.{{ oo_env }}.yml"
roles:
- - ../../../roles/atomic_base
- - ../../../roles/atomic_proxy
+ - ../../../roles/base_os
+ - ../../../roles/ipv6_disable
+ - ../../../roles/ansible_install
diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml
index fd6b0f39a..b4b294a02 100644
--- a/playbooks/aws/ansible-tower/launch.yml
+++ b/playbooks/aws/ansible-tower/launch.yml
@@ -6,7 +6,7 @@
vars:
inst_region: us-east-1
- atomic_ami: ami-8e239fe6
+ rhel7_ami: ami-a24e30ca
user_data_file: user_data.txt
oo_vpc_subnet_id: # Purposely left blank, these are here to be overridden in env vars_files
oo_assign_public_ip: # Purposely left blank, these are here to be overridden in env vars_files
@@ -22,8 +22,8 @@
region: "{{ inst_region }}"
keypair: mmcgrath_libra
group_id: "{{ oo_security_group_ids }}"
- instance_type: m3.large
- image: "{{ atomic_ami }}"
+ instance_type: c4.xlarge
+ image: "{{ rhel7_ami }}"
count: "{{ oo_new_inst_names | oo_len }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
@@ -42,8 +42,8 @@
region: "{{ inst_region }}"
keypair: mmcgrath_libra
group: ['Libra', '{{ oo_env }}', '{{ oo_env }}_proxy', '{{ oo_env }}_proxy_atomic']
- instance_type: m3.large
- image: "{{ atomic_ami }}"
+ instance_type: c4.xlarge
+ image: "{{ rhel7_ami }}"
count: "{{ oo_new_inst_names | oo_len }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
@@ -54,10 +54,6 @@
ec2: "{{ ec2_classic }}"
when: not oo_vpc_subnet_id
- - name: Add new instances public IPs to the atomic proxy host group
- add_host: "hostname={{ item.public_ip }} groupname=new_ec2_instances"
- with_items: ec2.instances
-
- name: Add Name and environment tags to instances
ec2_tag: "resource={{ item.1.id }} region={{ inst_region }} state=present"
with_together:
@@ -93,5 +89,15 @@
delay: 10
with_items: ec2.instances
+- name: Initial setup
+ hosts: oo_hosts_to_config
+ user: root
+ gather_facts: true
+
+ tasks:
+
+ - name: Yum update
+ yum: name=* state=latest
+
# Apply the configs, seprate so that just the configs can be run by themselves
-- include: config.yml
+#- include: config.yml
diff --git a/playbooks/aws/ansible-tower/vars.ops b/playbooks/aws/ansible-tower/vars.ops.yml
index feb5d786a..feb5d786a 100644
--- a/playbooks/aws/ansible-tower/vars.ops
+++ b/playbooks/aws/ansible-tower/vars.ops.yml
diff --git a/roles/ansible_install/tasks/main.yaml b/roles/ansible_install/tasks/main.yaml
new file mode 100644
index 000000000..67a04b919
--- /dev/null
+++ b/roles/ansible_install/tasks/main.yaml
@@ -0,0 +1,7 @@
+---
+# Install ansible client
+
+- name: Install Ansible
+ yum:
+ pkg: ansible
+ state: installed
diff --git a/roles/base_os/tasks/main.yaml b/roles/base_os/tasks/main.yaml
index 01d2898c5..dddedeaa8 100644
--- a/roles/base_os/tasks/main.yaml
+++ b/roles/base_os/tasks/main.yaml
@@ -16,6 +16,11 @@
src: vimrc
dest: /root/.vimrc
+- name: Bash Completion
+ yum:
+ pkg: bash-completion
+ state: installed
+
- name: Install firewalld
yum:
pkg: firewalld
diff --git a/roles/ipv6_disable/tasks/main.yaml b/roles/ipv6_disable/tasks/main.yaml
new file mode 100644
index 000000000..fae5beee7
--- /dev/null
+++ b/roles/ipv6_disable/tasks/main.yaml
@@ -0,0 +1,11 @@
+---
+# Disable ipv6 on RHEL7
+
+- name: Disable all ipv6
+ sysctl: name="net.ipv6.conf.all.disable_ipv6" value=1 sysctl_set=yes state=present reload=yes
+
+- name: Disable default ipv6
+ sysctl: name="net.ipv6.conf.default.disable_ipv6" value=1 sysctl_set=yes state=present reload=yes
+
+- name: Remove ipv6 localhost from /etc/hosts
+ lineinfile: dest='/etc/hosts' regexp='^::1 ' state=absent owner=root group=root mode=0644