summaryrefslogtreecommitdiffstats
path: root/playbooks/aws/openshift-minion
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2015-02-12 11:26:56 -0700
committerJhon Honce <jhonce@redhat.com>2015-02-16 15:53:18 -0700
commit7d74d1913274cba4c4732cbc5f0a573cb99e5248 (patch)
tree91b943f553a4d37673e0dd32647528b4cd89ad1f /playbooks/aws/openshift-minion
parent65e50b4dd338a4757a2bfb883d34d803350c3aae (diff)
downloadopenshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.gz
openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.bz2
openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.xz
openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.zip
- Rename minion to node
- Update playbooks to support latest code
Diffstat (limited to 'playbooks/aws/openshift-minion')
-rw-r--r--playbooks/aws/openshift-minion/config.yml40
-rw-r--r--playbooks/aws/openshift-minion/launch.yml69
-rw-r--r--playbooks/aws/openshift-minion/vars.yml0
3 files changed, 0 insertions, 109 deletions
diff --git a/playbooks/aws/openshift-minion/config.yml b/playbooks/aws/openshift-minion/config.yml
deleted file mode 100644
index b59ba5a9b..000000000
--- a/playbooks/aws/openshift-minion/config.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-- name: "populate oo_hosts_to_config host group if needed"
- hosts: localhost
- gather_facts: no
- tasks:
- - name: Evaluate oo_host_group_exp
- add_host: "name={{ item }} groups=oo_hosts_to_config"
- with_items: "{{ oo_host_group_exp | default('') }}"
- when: oo_host_group_exp is defined
-
-- name: "Gather facts for masters in {{ oo_env }}"
- hosts: "tag_env-host-type_{{ oo_env }}-openshift-master"
- connection: ssh
- user: root
-
-- name: "Set OO sepcific facts on localhost (for later use)"
- hosts: localhost
- gather_facts: no
- tasks:
- - name: Setting oo_master_ips fact on localhost
- set_fact:
- oo_master_ips: "{{ hostvars
- | oo_select_keys(groups['tag_env-host-type_' + oo_env + '-openshift-master'])
- | oo_collect(attribute='ansible_eth0.ipv4.address') }}"
- when: groups['tag_env-host-type_' + oo_env + '-openshift-master'] is defined
-
-- name: "Configure instances"
- hosts: oo_hosts_to_config
- connection: ssh
- user: root
- vars_files:
- - vars.yml
- roles:
- - ../../../roles/base_os
- - ../../../roles/repos
- - ../../../roles/docker
- - {
- role: ../../../roles/openshift_minion,
- oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}",
- oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}"
- }
diff --git a/playbooks/aws/openshift-minion/launch.yml b/playbooks/aws/openshift-minion/launch.yml
deleted file mode 100644
index a889b93be..000000000
--- a/playbooks/aws/openshift-minion/launch.yml
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- name: Launch instance(s)
- hosts: localhost
- connection: local
- gather_facts: no
-
- vars:
- inst_region: us-east-1
- atomic_ami: ami-86781fee
- user_data_file: user_data.txt
-
- vars_files:
- - vars.yml
-
- tasks:
- - name: Launch instances
- ec2:
- state: present
- region: "{{ inst_region }}"
- keypair: libra
- group: ['public']
- instance_type: m3.large
- image: "{{ atomic_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
- user_data: "{{ lookup('file', user_data_file) }}"
- wait: yes
- register: ec2
-
- - 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.dns_name }} 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.dns_name }}"
- 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.dns_name }} 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/openshift-minion/vars.yml b/playbooks/aws/openshift-minion/vars.yml
deleted file mode 100644
index e69de29bb..000000000
--- a/playbooks/aws/openshift-minion/vars.yml
+++ /dev/null