summaryrefslogtreecommitdiffstats
path: root/playbooks/aws
diff options
context:
space:
mode:
Diffstat (limited to 'playbooks/aws')
-rw-r--r--playbooks/aws/ansible-tower/launch.yml2
-rw-r--r--playbooks/aws/openshift-cluster/config.yml1
-rw-r--r--playbooks/aws/openshift-cluster/launch.yml8
-rw-r--r--playbooks/aws/openshift-cluster/service.yml28
-rw-r--r--playbooks/aws/openshift-cluster/tasks/launch_instances.yml3
-rw-r--r--playbooks/aws/openshift-master/launch.yml10
-rw-r--r--playbooks/aws/openshift-node/config.yml1
-rw-r--r--playbooks/aws/openshift-node/launch.yml10
-rw-r--r--playbooks/aws/os2-atomic-proxy/config.yml20
l---------playbooks/aws/os2-atomic-proxy/filter_plugins1
-rw-r--r--playbooks/aws/os2-atomic-proxy/launch.yml97
l---------playbooks/aws/os2-atomic-proxy/roles1
-rw-r--r--playbooks/aws/os2-atomic-proxy/user_data.txt6
-rw-r--r--playbooks/aws/os2-atomic-proxy/vars.int.yml3
-rw-r--r--playbooks/aws/os2-atomic-proxy/vars.prod.yml3
-rw-r--r--playbooks/aws/os2-atomic-proxy/vars.stg.yml10
-rw-r--r--playbooks/aws/os2-atomic-proxy/vars.yml1
17 files changed, 51 insertions, 154 deletions
diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml
index c23bda3a0..4bcc8b8dc 100644
--- a/playbooks/aws/ansible-tower/launch.yml
+++ b/playbooks/aws/ansible-tower/launch.yml
@@ -22,7 +22,7 @@
group_id: "{{ oo_security_group_ids }}"
instance_type: c4.xlarge
image: "{{ rhel7_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
+ count: "{{ oo_new_inst_names | length }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
assign_public_ip: "{{ oo_assign_public_ip }}"
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
index b8961704e..7188312ed 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/playbooks/aws/openshift-cluster/config.yml
@@ -32,5 +32,6 @@
openshift_cluster_id: "{{ cluster_id }}"
openshift_debug_level: 4
openshift_deployment_type: "{{ deployment_type }}"
+ openshift_first_master: "{{ groups.oo_first_master.0 }}"
openshift_hostname: "{{ ec2_private_ip_address }}"
openshift_public_hostname: "{{ ec2_ip_address }}"
diff --git a/playbooks/aws/openshift-cluster/launch.yml b/playbooks/aws/openshift-cluster/launch.yml
index 3eb5496e4..33e1ec25d 100644
--- a/playbooks/aws/openshift-cluster/launch.yml
+++ b/playbooks/aws/openshift-cluster/launch.yml
@@ -25,6 +25,14 @@
cluster: "{{ cluster_id }}"
type: "{{ k8s_type }}"
+ - set_fact:
+ a_master: "{{ master_names[0] }}"
+ - add_host: name={{ a_master }} groups=service_master
+
- include: update.yml
+- include: ../../common/openshift-cluster/create_services.yml
+ vars:
+ g_svc_master: "{{ service_master }}"
+
- include: list.yml
diff --git a/playbooks/aws/openshift-cluster/service.yml b/playbooks/aws/openshift-cluster/service.yml
new file mode 100644
index 000000000..25cf48505
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/service.yml
@@ -0,0 +1,28 @@
+---
+- name: Call same systemctl command for openshift on all instance(s)
+ hosts: localhost
+ gather_facts: no
+ vars_files:
+ - vars.yml
+ tasks:
+ - fail: msg="cluster_id is required to be injected in this playbook"
+ when: cluster_id is not defined
+
+ - name: Evaluate g_service_masters
+ add_host:
+ name: "{{ item }}"
+ groups: g_service_masters
+ ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
+ ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+ with_items: groups["tag_env-host-type_{{ cluster_id }}-openshift-master"] | default([])
+
+ - name: Evaluate g_service_nodes
+ add_host:
+ name: "{{ item }}"
+ groups: g_service_nodes
+ ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"
+ ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}"
+ with_items: groups["tag_env-host-type_{{ cluster_id }}-openshift-node"] | default([])
+
+- include: ../../common/openshift-node/service.yml
+- include: ../../common/openshift-master/service.yml
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 666a8d1fb..060147659 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -79,13 +79,14 @@
group: "{{ ec2_security_groups }}"
instance_type: "{{ ec2_instance_type }}"
image: "{{ latest_ami }}"
- count: "{{ instances | oo_len }}"
+ count: "{{ instances | length }}"
vpc_subnet_id: "{{ ec2_vpc_subnet | default(omit, true) }}"
assign_public_ip: "{{ ec2_assign_public_ip | default(omit, true) }}"
user_data: "{{ user_data }}"
wait: yes
instance_tags:
created-by: "{{ created_by }}"
+ environment: "{{ env }}"
env: "{{ env }}"
host-type: "{{ host_type }}"
env-host-type: "{{ env_host_type }}"
diff --git a/playbooks/aws/openshift-master/launch.yml b/playbooks/aws/openshift-master/launch.yml
index 6b3751682..1cefad492 100644
--- a/playbooks/aws/openshift-master/launch.yml
+++ b/playbooks/aws/openshift-master/launch.yml
@@ -4,10 +4,10 @@
connection: local
gather_facts: no
-# TODO: modify atomic_ami based on deployment_type
+# TODO: modify g_ami based on deployment_type
vars:
inst_region: us-east-1
- atomic_ami: ami-86781fee
+ g_ami: ami-86781fee
user_data_file: user_data.txt
tasks:
@@ -18,13 +18,13 @@
keypair: libra
group: ['public']
instance_type: m3.large
- image: "{{ atomic_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
+ image: "{{ g_ami }}"
+ count: "{{ oo_new_inst_names | length }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
register: ec2
- - name: Add new instances public IPs to the atomic proxy host group
+ - name: Add new instances public IPs to the host group
add_host: "hostname={{ item.public_ip }} groupname=new_ec2_instances"
with_items: ec2.instances
diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml
index fc9b397b4..a993a1e99 100644
--- a/playbooks/aws/openshift-node/config.yml
+++ b/playbooks/aws/openshift-node/config.yml
@@ -21,5 +21,6 @@
openshift_cluster_id: "{{ cluster_id }}"
openshift_debug_level: 4
openshift_deployment_type: "{{ deployment_type }}"
+ openshift_first_master: "{{ groups.oo_first_master.0 }}"
openshift_hostname: "{{ ec2_private_ip_address }}"
openshift_public_hostname: "{{ ec2_ip_address }}"
diff --git a/playbooks/aws/openshift-node/launch.yml b/playbooks/aws/openshift-node/launch.yml
index 36aee14ff..e7d1f7310 100644
--- a/playbooks/aws/openshift-node/launch.yml
+++ b/playbooks/aws/openshift-node/launch.yml
@@ -4,10 +4,10 @@
connection: local
gather_facts: no
-# TODO: modify atomic_ami based on deployment_type
+# TODO: modify g_ami based on deployment_type
vars:
inst_region: us-east-1
- atomic_ami: ami-86781fee
+ g_ami: ami-86781fee
user_data_file: user_data.txt
tasks:
@@ -18,13 +18,13 @@
keypair: libra
group: ['public']
instance_type: m3.large
- image: "{{ atomic_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
+ image: "{{ g_ami }}"
+ count: "{{ oo_new_inst_names | length }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
register: ec2
- - name: Add new instances public IPs to the atomic proxy host group
+ - name: Add new instances public IPs to the host group
add_host:
hostname: "{{ item.public_ip }}"
groupname: new_ec2_instances"
diff --git a/playbooks/aws/os2-atomic-proxy/config.yml b/playbooks/aws/os2-atomic-proxy/config.yml
deleted file mode 100644
index 7d384a665..000000000
--- a/playbooks/aws/os2-atomic-proxy/config.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: "populate oo_hosts_to_config host group if needed"
- hosts: localhost
- gather_facts: no
- tasks:
- - name: Evaluate oo_host_group_exp if it's set
- add_host: "name={{ item }} groups=oo_hosts_to_config"
- with_items: "{{ oo_host_group_exp | default(['']) }}"
- when: oo_host_group_exp is defined
-
-- name: "Configure instances"
- hosts: oo_hosts_to_config
- connection: ssh
- user: root
- vars_files:
- - vars.yml
- - "vars.{{ oo_env }}.yml"
- roles:
- - atomic_base
- - atomic_proxy
diff --git a/playbooks/aws/os2-atomic-proxy/filter_plugins b/playbooks/aws/os2-atomic-proxy/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/aws/os2-atomic-proxy/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins \ No newline at end of file
diff --git a/playbooks/aws/os2-atomic-proxy/launch.yml b/playbooks/aws/os2-atomic-proxy/launch.yml
deleted file mode 100644
index fd6b0f39a..000000000
--- a/playbooks/aws/os2-atomic-proxy/launch.yml
+++ /dev/null
@@ -1,97 +0,0 @@
----
-- name: Launch instance(s)
- hosts: localhost
- connection: local
- gather_facts: no
-
- vars:
- inst_region: us-east-1
- atomic_ami: ami-8e239fe6
- 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
-
- vars_files:
- - vars.yml
- - "vars.{{ oo_env }}.yml"
-
- tasks:
- - name: Launch instances in VPC
- ec2:
- state: present
- region: "{{ inst_region }}"
- keypair: mmcgrath_libra
- group_id: "{{ oo_security_group_ids }}"
- instance_type: m3.large
- image: "{{ atomic_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
- user_data: "{{ lookup('file', user_data_file) }}"
- wait: yes
- assign_public_ip: "{{ oo_assign_public_ip }}"
- vpc_subnet_id: "{{ oo_vpc_subnet_id }}"
- when: oo_vpc_subnet_id
- register: ec2_vpc
-
- - set_fact:
- ec2: "{{ ec2_vpc }}"
- when: oo_vpc_subnet_id
-
- - name: Launch instances in Classic
- ec2:
- state: present
- region: "{{ inst_region }}"
- keypair: mmcgrath_libra
- group: ['Libra', '{{ oo_env }}', '{{ oo_env }}_proxy', '{{ oo_env }}_proxy_atomic']
- instance_type: m3.large
- image: "{{ atomic_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
- user_data: "{{ lookup('file', user_data_file) }}"
- wait: yes
- when: not oo_vpc_subnet_id
- register: ec2_classic
-
- - set_fact:
- 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:
- - oo_new_inst_names
- - ec2.instances
- args:
- tags:
- Name: "{{ item.0 }}"
-
- - name: Add other tags to instances
- ec2_tag: "resource={{ item.id }} region={{ inst_region }} state=present"
- with_items: ec2.instances
- args:
- tags: "{{ oo_new_inst_tags }}"
-
- - name: Add new instances public IPs to oo_hosts_to_config
- add_host: "hostname={{ item.0 }} ansible_ssh_host={{ item.1.public_ip }} groupname=oo_hosts_to_config"
- with_together:
- - oo_new_inst_names
- - ec2.instances
-
- - debug: var=ec2
-
- - name: Wait for ssh
- wait_for: "port=22 host={{ item.public_ip }}"
- with_items: ec2.instances
-
- - name: Wait for root user setup
- command: "ssh -o StrictHostKeyChecking=no -o PasswordAuthentication=no -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null root@{{ item.public_ip }} echo root user is setup"
- register: result
- until: result.rc == 0
- retries: 20
- delay: 10
- with_items: ec2.instances
-
-# Apply the configs, seprate so that just the configs can be run by themselves
-- include: config.yml
diff --git a/playbooks/aws/os2-atomic-proxy/roles b/playbooks/aws/os2-atomic-proxy/roles
deleted file mode 120000
index 20c4c58cf..000000000
--- a/playbooks/aws/os2-atomic-proxy/roles
+++ /dev/null
@@ -1 +0,0 @@
-../../../roles \ No newline at end of file
diff --git a/playbooks/aws/os2-atomic-proxy/user_data.txt b/playbooks/aws/os2-atomic-proxy/user_data.txt
deleted file mode 100644
index 643d17c32..000000000
--- a/playbooks/aws/os2-atomic-proxy/user_data.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-#cloud-config
-disable_root: 0
-
-system_info:
- default_user:
- name: root
diff --git a/playbooks/aws/os2-atomic-proxy/vars.int.yml b/playbooks/aws/os2-atomic-proxy/vars.int.yml
deleted file mode 100644
index 00157cd89..000000000
--- a/playbooks/aws/os2-atomic-proxy/vars.int.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-oo_env_long: integration
-oo_zabbix_hostgroups: ['INT Environment']
diff --git a/playbooks/aws/os2-atomic-proxy/vars.prod.yml b/playbooks/aws/os2-atomic-proxy/vars.prod.yml
deleted file mode 100644
index 641afc626..000000000
--- a/playbooks/aws/os2-atomic-proxy/vars.prod.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-oo_env_long: production
-oo_zabbix_hostgroups: ['PROD Environment']
diff --git a/playbooks/aws/os2-atomic-proxy/vars.stg.yml b/playbooks/aws/os2-atomic-proxy/vars.stg.yml
deleted file mode 100644
index 1cecfc9b2..000000000
--- a/playbooks/aws/os2-atomic-proxy/vars.stg.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-oo_env_long: staging
-oo_zabbix_hostgroups: ['STG Environment']
-oo_vpc_subnet_id: subnet-700bdd07
-oo_assign_public_ip: yes
-oo_security_group_ids:
- - sg-02c2f267 # Libra (vpc)
- - sg-f0bfbe95 # stg (vpc)
- - sg-a3bfbec6 # stg_proxy (vpc)
- - sg-d4bfbeb1 # stg_proxy_atomic (vpc)
diff --git a/playbooks/aws/os2-atomic-proxy/vars.yml b/playbooks/aws/os2-atomic-proxy/vars.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/playbooks/aws/os2-atomic-proxy/vars.yml
+++ /dev/null
@@ -1 +0,0 @@
----
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 04:56:24 +0000