From 346da608fbc71029ccac7ca559af38b0f218f3fe Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Wed, 1 Oct 2014 14:30:13 -0700 Subject: WIP Infra - Add playbooks for using openshift binary * Fixed terminate so that it properly removes the attached OS disk. --- cluster.sh | 23 ++++-- playbooks/gce/origin-master/config.yml | 39 ++++++++++ playbooks/gce/origin-master/launch.yml | 38 +++++++++ playbooks/gce/origin-master/terminate.yml | 39 ++++++++++ playbooks/gce/origin-master/vars.yml | 0 playbooks/gce/origin-minion/config.yml | 39 ++++++++++ playbooks/gce/origin-minion/launch.yml | 38 +++++++++ playbooks/gce/origin-minion/terminate.yml | 39 ++++++++++ playbooks/gce/origin-minion/vars.yml | 0 playbooks/gce/os3-master/terminate.yml | 21 +++-- roles/origin_master/README.md | 38 +++++++++ roles/origin_master/defaults/main.yml | 2 + roles/origin_master/handlers/main.yml | 4 + roles/origin_master/meta/main.yml | 124 ++++++++++++++++++++++++++++++ roles/origin_master/tasks/main.yml | 25 ++++++ roles/origin_master/vars/main.yml | 2 + roles/origin_minion/README.md | 38 +++++++++ roles/origin_minion/defaults/main.yml | 2 + roles/origin_minion/handlers/main.yml | 4 + roles/origin_minion/meta/main.yml | 124 ++++++++++++++++++++++++++++++ roles/origin_minion/tasks/main.yml | 24 ++++++ roles/origin_minion/vars/main.yml | 2 + roles/repos/files/docker.repo | 2 +- roles/repos/files/epel7-origin.repo | 6 ++ roles/repos/tasks/main.yaml | 3 + 25 files changed, 656 insertions(+), 20 deletions(-) create mode 100644 playbooks/gce/origin-master/config.yml create mode 100644 playbooks/gce/origin-master/launch.yml create mode 100644 playbooks/gce/origin-master/terminate.yml create mode 100644 playbooks/gce/origin-master/vars.yml create mode 100644 playbooks/gce/origin-minion/config.yml create mode 100644 playbooks/gce/origin-minion/launch.yml create mode 100644 playbooks/gce/origin-minion/terminate.yml create mode 100644 playbooks/gce/origin-minion/vars.yml create mode 100644 roles/origin_master/README.md create mode 100644 roles/origin_master/defaults/main.yml create mode 100644 roles/origin_master/handlers/main.yml create mode 100644 roles/origin_master/meta/main.yml create mode 100644 roles/origin_master/tasks/main.yml create mode 100644 roles/origin_master/vars/main.yml create mode 100644 roles/origin_minion/README.md create mode 100644 roles/origin_minion/defaults/main.yml create mode 100644 roles/origin_minion/handlers/main.yml create mode 100644 roles/origin_minion/meta/main.yml create mode 100644 roles/origin_minion/tasks/main.yml create mode 100644 roles/origin_minion/vars/main.yml create mode 100644 roles/repos/files/epel7-origin.repo diff --git a/cluster.sh b/cluster.sh index 50fbe66eb..3aaabd07d 100755 --- a/cluster.sh +++ b/cluster.sh @@ -1,9 +1,16 @@ #!/bin/bash -eu -MINIONS=3 +MINIONS=1 MASTERS=1 PROVIDER=gce +# FIXME: Add option +#MASTER_PLAYBOOK=os3-master +MASTER_PLAYBOOK=openshift-master +#MINION_PLAYBOOK=os3-minion +MINION_PLAYBOOK=openshift-minion + + # @formatter:off function usage { cat 1>&2 <<-EOT @@ -17,29 +24,29 @@ EOT function create_cluser { for (( i = 0; i < $MINIONS; i ++ )); do - ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=os3-minion + ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MINION_PLAYBOOK done for (( i = 0; i < $MASTERS; i ++ )); do - ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=os3-master + ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MASTER_PLAYBOOK done update_cluster - echo -e "\nCreated ${MASTERS} masters and ${MINIONS} minions using ${PROVIDER} provider\n" + echo -e "\nCreated ${MASTERS} ${MASTER_PLAYBOOK} masters and ${MINIONS} ${MINION_PLAYBOOK} minions using ${PROVIDER} provider\n" } function update_cluster { for (( i = 0; i < $MINIONS; i ++ )); do - ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=os3-minion + ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MINION_PLAYBOOK done for (( i = 0; i < $MASTERS; i ++ )); do - ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=os3-master + ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MASTER_PLAYBOOK done } function terminate_cluster { - #./cloud.rb "${PROVIDER}" terminate -e "${ENV}" --type=os3-master - ./cloud.rb "${PROVIDER}" terminate -e "${ENV}" --type=os3-minion + ./cloud.rb "${PROVIDER}" terminate -e "${ENV}" --type=$MASTER_PLAYBOOK + ./cloud.rb "${PROVIDER}" terminate -e "${ENV}" --type=$MINION_PLAYBOOK } [ -f ./cloud.rb ] || (echo 1>&2 'Cannot find ./cloud.rb' && exit 1) diff --git a/playbooks/gce/origin-master/config.yml b/playbooks/gce/origin-master/config.yml new file mode 100644 index 000000000..681f804cc --- /dev/null +++ b/playbooks/gce/origin-master/config.yml @@ -0,0 +1,39 @@ +- 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: "Gather facts for minions in {{ oo_env }}" + hosts: "tag_env-host-type-{{ oo_env }}-openshift-minion" + connection: ssh + user: root + +- name: "Set Origin specific facts on localhost (for later use)" + hosts: localhost + gather_facts: no + tasks: + - name: Setting oo_minion_ips fact on localhost + set_fact: + oo_minion_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-minion']) + | oo_collect(attribute='ansible_eth0.ipv4.address') }}" + when: groups['tag_env-host-type-' + oo_env + '-openshift-minion'] is defined + +- name: "Configure instances" + hosts: oo_hosts_to_config + connection: ssh + user: root + vars_files: + - vars.yml + roles: + - ../../../roles/base_os + - ../../../roles/repos + - { + role: ../../../roles/openshift_master, + oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}" + } + - ../../../roles/pods diff --git a/playbooks/gce/origin-master/launch.yml b/playbooks/gce/origin-master/launch.yml new file mode 100644 index 000000000..0a3ac3fdd --- /dev/null +++ b/playbooks/gce/origin-master/launch.yml @@ -0,0 +1,38 @@ +--- +- name: Launch instance(s) + hosts: localhost + connection: local + gather_facts: no + + vars: + inst_names: "{{ oo_new_inst_names }}" + machine_type: n1-standard-1 + image: libra-rhel7 + + vars_files: + - vars.yml + + tasks: + - name: Launch instances + gce: + instance_names: "{{ inst_names }}" + machine_type: "{{ machine_type }}" + image: "{{ image }}" + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + tags: "{{ oo_new_inst_tags }}" + register: gce + + - name: Add new instances public IPs to oo_hosts_to_config + add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config" + with_items: gce.instance_data + + - name: Wait for ssh + wait_for: "port=22 host={{ item.public_ip }}" + with_items: gce.instance_data + + - debug: var=gce + +# Apply the configs, separate so that just the configs can be run by themselves +- include: config.yml diff --git a/playbooks/gce/origin-master/terminate.yml b/playbooks/gce/origin-master/terminate.yml new file mode 100644 index 000000000..b6a1b38e4 --- /dev/null +++ b/playbooks/gce/origin-master/terminate.yml @@ -0,0 +1,39 @@ +- name: "populate oo_hosts_to_terminate host group if needed" + hosts: localhost + gather_facts: no + tasks: + - debug: var=oo_host_group_exp + + - name: Evaluate oo_host_group_exp if it's set + add_host: "name={{ item }} groups=oo_hosts_to_terminate" + with_items: "{{ oo_host_group_exp | default('') }}" + when: oo_host_group_exp is defined + + - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" + + +- name: Terminate instances + hosts: localhost + connection: local + tasks: + - name: Terminate master instances + gce: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + state: 'absent' + instance_names: "{{ groups['oo_hosts_to_terminate'] }}" + disks: "{{ groups['oo_hosts_to_terminate'] }}" + register: gce + + - debug: var=gce + +# - name: Remove disks of instances +# gce_pd: +# service_account_email: "{{ gce_service_account_email }}" +# pem_file: "{{ gce_pem_file }}" +# project_id: "{{ gce_project_id }}" +# name: "{{ item }}" +# state: deleted +# with_items: gce.instance_names + diff --git a/playbooks/gce/origin-master/vars.yml b/playbooks/gce/origin-master/vars.yml new file mode 100644 index 000000000..e69de29bb diff --git a/playbooks/gce/origin-minion/config.yml b/playbooks/gce/origin-minion/config.yml new file mode 100644 index 000000000..0a92d41c7 --- /dev/null +++ b/playbooks/gce/origin-minion/config.yml @@ -0,0 +1,39 @@ +- 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(['']) }}" + } diff --git a/playbooks/gce/origin-minion/launch.yml b/playbooks/gce/origin-minion/launch.yml new file mode 100644 index 000000000..0a3ac3fdd --- /dev/null +++ b/playbooks/gce/origin-minion/launch.yml @@ -0,0 +1,38 @@ +--- +- name: Launch instance(s) + hosts: localhost + connection: local + gather_facts: no + + vars: + inst_names: "{{ oo_new_inst_names }}" + machine_type: n1-standard-1 + image: libra-rhel7 + + vars_files: + - vars.yml + + tasks: + - name: Launch instances + gce: + instance_names: "{{ inst_names }}" + machine_type: "{{ machine_type }}" + image: "{{ image }}" + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + tags: "{{ oo_new_inst_tags }}" + register: gce + + - name: Add new instances public IPs to oo_hosts_to_config + add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config" + with_items: gce.instance_data + + - name: Wait for ssh + wait_for: "port=22 host={{ item.public_ip }}" + with_items: gce.instance_data + + - debug: var=gce + +# Apply the configs, separate so that just the configs can be run by themselves +- include: config.yml diff --git a/playbooks/gce/origin-minion/terminate.yml b/playbooks/gce/origin-minion/terminate.yml new file mode 100644 index 000000000..d31f175e1 --- /dev/null +++ b/playbooks/gce/origin-minion/terminate.yml @@ -0,0 +1,39 @@ +- name: "populate oo_hosts_to_terminate host group if needed" + hosts: localhost + gather_facts: no + tasks: + - debug: var=oo_host_group_exp + + - name: Evaluate oo_host_group_exp if it's set + add_host: "name={{ item }} groups=oo_hosts_to_terminate" + with_items: "{{ oo_host_group_exp | default('') }}" + when: oo_host_group_exp is defined + + - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" + + +- name: Terminate instances + hosts: localhost + connection: local + tasks: + - name: Terminate minion instances + gce: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + state: 'absent' + instance_names: "{{ groups['oo_hosts_to_terminate'] }}" + disks: "{{ groups['oo_hosts_to_terminate'] }}" + register: gce + + - debug: var=gce + +# - name: Remove disks of instances +# gce_pd: +# service_account_email: "{{ gce_service_account_email }}" +# pem_file: "{{ gce_pem_file }}" +# project_id: "{{ gce_project_id }}" +# name: "{{ item }}" +# state: deleted +# with_items: gce.instance_names + diff --git a/playbooks/gce/origin-minion/vars.yml b/playbooks/gce/origin-minion/vars.yml new file mode 100644 index 000000000..e69de29bb diff --git a/playbooks/gce/os3-master/terminate.yml b/playbooks/gce/os3-master/terminate.yml index b6a1b38e4..7895cf016 100644 --- a/playbooks/gce/os3-master/terminate.yml +++ b/playbooks/gce/os3-master/terminate.yml @@ -11,7 +11,6 @@ - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" - - name: Terminate instances hosts: localhost connection: local @@ -25,15 +24,15 @@ instance_names: "{{ groups['oo_hosts_to_terminate'] }}" disks: "{{ groups['oo_hosts_to_terminate'] }}" register: gce - - - debug: var=gce -# - name: Remove disks of instances -# gce_pd: -# service_account_email: "{{ gce_service_account_email }}" -# pem_file: "{{ gce_pem_file }}" -# project_id: "{{ gce_project_id }}" -# name: "{{ item }}" -# state: deleted -# with_items: gce.instance_names + - debug: var=gce + - name: Remove disks of instances + gce_pd: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + name: "{{ item }}" + zone: "{{ gce.zone }}" + state: absent + with_items: gce.instance_names diff --git a/roles/origin_master/README.md b/roles/origin_master/README.md new file mode 100644 index 000000000..225dd44b9 --- /dev/null +++ b/roles/origin_master/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/origin_master/defaults/main.yml b/roles/origin_master/defaults/main.yml new file mode 100644 index 000000000..c7d14b676 --- /dev/null +++ b/roles/origin_master/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for openshift_master diff --git a/roles/origin_master/handlers/main.yml b/roles/origin_master/handlers/main.yml new file mode 100644 index 000000000..216af5dc9 --- /dev/null +++ b/roles/origin_master/handlers/main.yml @@ -0,0 +1,4 @@ +--- +# handlers file for openshift_master +- name: restart openshift-master + service: name=openshift state=restarted diff --git a/roles/origin_master/meta/main.yml b/roles/origin_master/meta/main.yml new file mode 100644 index 000000000..c5c362c60 --- /dev/null +++ b/roles/origin_master/meta/main.yml @@ -0,0 +1,124 @@ +--- +galaxy_info: + author: your name + description: + company: your company (optional) + # Some suggested licenses: + # - BSD (default) + # - MIT + # - GPLv2 + # - GPLv3 + # - Apache + # - CC-BY + license: license (GPLv2, CC-BY, etc) + min_ansible_version: 1.2 + # + # Below are all platforms currently available. Just uncomment + # the ones that apply to your role. If you don't see your + # platform on this list, let us know and we'll get it added! + # + #platforms: + #- name: EL + # versions: + # - all + # - 5 + # - 6 + # - 7 + #- name: GenericUNIX + # versions: + # - all + # - any + #- name: Fedora + # versions: + # - all + # - 16 + # - 17 + # - 18 + # - 19 + # - 20 + #- name: opensuse + # versions: + # - all + # - 12.1 + # - 12.2 + # - 12.3 + # - 13.1 + # - 13.2 + #- name: Amazon + # versions: + # - all + # - 2013.03 + # - 2013.09 + #- name: GenericBSD + # versions: + # - all + # - any + #- name: FreeBSD + # versions: + # - all + # - 8.0 + # - 8.1 + # - 8.2 + # - 8.3 + # - 8.4 + # - 9.0 + # - 9.1 + # - 9.1 + # - 9.2 + #- name: Ubuntu + # versions: + # - all + # - lucid + # - maverick + # - natty + # - oneiric + # - precise + # - quantal + # - raring + # - saucy + # - trusty + #- name: SLES + # versions: + # - all + # - 10SP3 + # - 10SP4 + # - 11 + # - 11SP1 + # - 11SP2 + # - 11SP3 + #- name: GenericLinux + # versions: + # - all + # - any + #- name: Debian + # versions: + # - all + # - etch + # - lenny + # - squeeze + # - wheezy + # + # Below are all categories currently available. Just as with + # the platforms above, uncomment those that apply to your role. + # + #categories: + #- cloud + #- cloud:ec2 + #- cloud:gce + #- cloud:rax + #- clustering + #- database + #- database:nosql + #- database:sql + #- development + #- monitoring + #- networking + #- packaging + #- system + #- web +dependencies: [] + # List your role dependencies here, one per line. Only + # dependencies available via galaxy should be listed here. + # Be sure to remove the '[]' above if you add dependencies + # to this list. + diff --git a/roles/origin_master/tasks/main.yml b/roles/origin_master/tasks/main.yml new file mode 100644 index 000000000..3963b5090 --- /dev/null +++ b/roles/origin_master/tasks/main.yml @@ -0,0 +1,25 @@ +--- +# tasks file for openshift_master +- name: Install Origin + yum: pkg=openshift state=installed + +- name: Configure Origin settings + lineinfile: > + dest=/etc/sysconfig/openshift + regexp={{ item.regex }} + line="{{ item.line }}" + with_items: + - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"' } + - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} + notify: + - restart openshift-master + +- name: Enable OpenShift + service: name=openshift enabled=yes state=started + +- name: Open firewalld port for Origin + firewalld: port=8080/tcp permanent=false state=enabled + +- name: Save firewalld port for Origin + firewalld: port=8080/tcp permanent=true state=enabled + diff --git a/roles/origin_master/vars/main.yml b/roles/origin_master/vars/main.yml new file mode 100644 index 000000000..1f5cb46d6 --- /dev/null +++ b/roles/origin_master/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for kubernetes_apiserver diff --git a/roles/origin_minion/README.md b/roles/origin_minion/README.md new file mode 100644 index 000000000..225dd44b9 --- /dev/null +++ b/roles/origin_minion/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/origin_minion/defaults/main.yml b/roles/origin_minion/defaults/main.yml new file mode 100644 index 000000000..dfcf3d98f --- /dev/null +++ b/roles/origin_minion/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for openshift_minion diff --git a/roles/origin_minion/handlers/main.yml b/roles/origin_minion/handlers/main.yml new file mode 100644 index 000000000..2764456f4 --- /dev/null +++ b/roles/origin_minion/handlers/main.yml @@ -0,0 +1,4 @@ +--- +# handlers file for openshift_minion +- name: restart openshift-minion + service: name=openshift state=restarted diff --git a/roles/origin_minion/meta/main.yml b/roles/origin_minion/meta/main.yml new file mode 100644 index 000000000..c5c362c60 --- /dev/null +++ b/roles/origin_minion/meta/main.yml @@ -0,0 +1,124 @@ +--- +galaxy_info: + author: your name + description: + company: your company (optional) + # Some suggested licenses: + # - BSD (default) + # - MIT + # - GPLv2 + # - GPLv3 + # - Apache + # - CC-BY + license: license (GPLv2, CC-BY, etc) + min_ansible_version: 1.2 + # + # Below are all platforms currently available. Just uncomment + # the ones that apply to your role. If you don't see your + # platform on this list, let us know and we'll get it added! + # + #platforms: + #- name: EL + # versions: + # - all + # - 5 + # - 6 + # - 7 + #- name: GenericUNIX + # versions: + # - all + # - any + #- name: Fedora + # versions: + # - all + # - 16 + # - 17 + # - 18 + # - 19 + # - 20 + #- name: opensuse + # versions: + # - all + # - 12.1 + # - 12.2 + # - 12.3 + # - 13.1 + # - 13.2 + #- name: Amazon + # versions: + # - all + # - 2013.03 + # - 2013.09 + #- name: GenericBSD + # versions: + # - all + # - any + #- name: FreeBSD + # versions: + # - all + # - 8.0 + # - 8.1 + # - 8.2 + # - 8.3 + # - 8.4 + # - 9.0 + # - 9.1 + # - 9.1 + # - 9.2 + #- name: Ubuntu + # versions: + # - all + # - lucid + # - maverick + # - natty + # - oneiric + # - precise + # - quantal + # - raring + # - saucy + # - trusty + #- name: SLES + # versions: + # - all + # - 10SP3 + # - 10SP4 + # - 11 + # - 11SP1 + # - 11SP2 + # - 11SP3 + #- name: GenericLinux + # versions: + # - all + # - any + #- name: Debian + # versions: + # - all + # - etch + # - lenny + # - squeeze + # - wheezy + # + # Below are all categories currently available. Just as with + # the platforms above, uncomment those that apply to your role. + # + #categories: + #- cloud + #- cloud:ec2 + #- cloud:gce + #- cloud:rax + #- clustering + #- database + #- database:nosql + #- database:sql + #- development + #- monitoring + #- networking + #- packaging + #- system + #- web +dependencies: [] + # List your role dependencies here, one per line. Only + # dependencies available via galaxy should be listed here. + # Be sure to remove the '[]' above if you add dependencies + # to this list. + diff --git a/roles/origin_minion/tasks/main.yml b/roles/origin_minion/tasks/main.yml new file mode 100644 index 000000000..3bb62b438 --- /dev/null +++ b/roles/origin_minion/tasks/main.yml @@ -0,0 +1,24 @@ +--- +# tasks file for openshift_minion +- name: Install OpenShift + yum: pkg=openshift state=installed + +- name: Configure OpenShift settings + lineinfile: > + dest=/etc/sysconfig/openshift + regexp={{ item.regex }} + line="{{ item.line }}" + with_items: + - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_master_ips[0] }}\"' } + - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} + notify: + - restart openshift-minion + +- name: Enable OpenShift + service: name=openshift enabled=yes state=started + +- name: Open firewalld port for OpenShift + firewalld: port=10250/tcp permanent=false state=enabled + +- name: Save firewalld port for OpenShift + firewalld: port=10250/tcp permanent=true state=enabled diff --git a/roles/origin_minion/vars/main.yml b/roles/origin_minion/vars/main.yml new file mode 100644 index 000000000..715fba487 --- /dev/null +++ b/roles/origin_minion/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for openshift_minion diff --git a/roles/repos/files/docker.repo b/roles/repos/files/docker.repo index 25ecf9310..5722284f5 100644 --- a/roles/repos/files/docker.repo +++ b/roles/repos/files/docker.repo @@ -2,4 +2,4 @@ name= Temporary Docker rpm baseurl=http://10.240.169.148/mirror/docker gpgcheck=0 -enabled=1 +enabled=0 diff --git a/roles/repos/files/epel7-origin.repo b/roles/repos/files/epel7-origin.repo new file mode 100644 index 000000000..c7629872d --- /dev/null +++ b/roles/repos/files/epel7-origin.repo @@ -0,0 +1,6 @@ +[maxamillion-origin-next] +name=Copr repo for origin-next owned by maxamillion +baseurl=http://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/ +skip_if_unavailable=False +gpgcheck=0 +enabled=1 diff --git a/roles/repos/tasks/main.yaml b/roles/repos/tasks/main.yaml index d078f9c97..ccddfc26c 100644 --- a/roles/repos/tasks/main.yaml +++ b/roles/repos/tasks/main.yaml @@ -25,3 +25,6 @@ - name: Ensure the kubernetes repo is available copy: src=epel7-kubernetes.repo dest=/etc/yum.repos.d/epel7-kubernetes.repo + +- name: Ensure the origin repo is available + copy: src=epel7-origin.repo dest=/etc/yum.repos.d/epel7-origin.repo -- cgit v1.2.3 From 2808f726dacb60e58c289c18a91258e0526705a3 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Wed, 1 Oct 2014 15:32:59 -0700 Subject: WIP Infra - Refactor terminate * remove persistent disks from images --- playbooks/gce/origin-master/terminate.yml | 20 +++++++++++--------- playbooks/gce/origin-minion/terminate.yml | 18 ++++++++++-------- playbooks/gce/os3-minion/terminate.yml | 17 +++++++++-------- 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/playbooks/gce/origin-master/terminate.yml b/playbooks/gce/origin-master/terminate.yml index b6a1b38e4..76e1404b5 100644 --- a/playbooks/gce/origin-master/terminate.yml +++ b/playbooks/gce/origin-master/terminate.yml @@ -25,15 +25,17 @@ instance_names: "{{ groups['oo_hosts_to_terminate'] }}" disks: "{{ groups['oo_hosts_to_terminate'] }}" register: gce - + - debug: var=gce -# - name: Remove disks of instances -# gce_pd: -# service_account_email: "{{ gce_service_account_email }}" -# pem_file: "{{ gce_pem_file }}" -# project_id: "{{ gce_project_id }}" -# name: "{{ item }}" -# state: deleted -# with_items: gce.instance_names + - name: Remove disks of instances + gce_pd: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + name: "{{ item }}" + zone: "{{ gce.zone }}" + state: absent + with_items: gce.instance_names + diff --git a/playbooks/gce/origin-minion/terminate.yml b/playbooks/gce/origin-minion/terminate.yml index d31f175e1..97b31eca0 100644 --- a/playbooks/gce/origin-minion/terminate.yml +++ b/playbooks/gce/origin-minion/terminate.yml @@ -28,12 +28,14 @@ - debug: var=gce -# - name: Remove disks of instances -# gce_pd: -# service_account_email: "{{ gce_service_account_email }}" -# pem_file: "{{ gce_pem_file }}" -# project_id: "{{ gce_project_id }}" -# name: "{{ item }}" -# state: deleted -# with_items: gce.instance_names + - name: Remove disks of instances + gce_pd: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + name: "{{ item }}" + zone: "{{ gce.zone }}" + state: absent + with_items: gce.instance_names + diff --git a/playbooks/gce/os3-minion/terminate.yml b/playbooks/gce/os3-minion/terminate.yml index d31f175e1..0c7a2f55e 100644 --- a/playbooks/gce/os3-minion/terminate.yml +++ b/playbooks/gce/os3-minion/terminate.yml @@ -28,12 +28,13 @@ - debug: var=gce -# - name: Remove disks of instances -# gce_pd: -# service_account_email: "{{ gce_service_account_email }}" -# pem_file: "{{ gce_pem_file }}" -# project_id: "{{ gce_project_id }}" -# name: "{{ item }}" -# state: deleted -# with_items: gce.instance_names + - name: Remove disks of instances + gce_pd: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + name: "{{ item }}" + zone: "{{ gce.zone }}" + state: absent + with_items: gce.instance_names -- cgit v1.2.3 From b1b2cbe00cfe766a414972352730454c1e79c2c2 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Wed, 1 Oct 2014 15:39:26 -0700 Subject: Finish origin -> openshift rename --- .gitignore | 15 ++++ cluster.sh | 18 ++-- playbooks/gce/openshift-master/config.yml | 39 +++++++++ playbooks/gce/openshift-master/launch.yml | 38 ++++++++ playbooks/gce/openshift-master/terminate.yml | 41 +++++++++ playbooks/gce/openshift-master/vars.yml | 0 playbooks/gce/openshift-minion/config.yml | 39 +++++++++ playbooks/gce/openshift-minion/launch.yml | 38 ++++++++ playbooks/gce/openshift-minion/terminate.yml | 41 +++++++++ playbooks/gce/openshift-minion/vars.yml | 0 playbooks/gce/origin-master/config.yml | 39 --------- playbooks/gce/origin-master/launch.yml | 38 -------- playbooks/gce/origin-master/terminate.yml | 41 --------- playbooks/gce/origin-master/vars.yml | 0 playbooks/gce/origin-minion/config.yml | 39 --------- playbooks/gce/origin-minion/launch.yml | 38 -------- playbooks/gce/origin-minion/terminate.yml | 41 --------- playbooks/gce/origin-minion/vars.yml | 0 roles/openshift_master/README.md | 38 ++++++++ roles/openshift_master/defaults/main.yml | 2 + roles/openshift_master/handlers/main.yml | 4 + roles/openshift_master/meta/main.yml | 124 +++++++++++++++++++++++++++ roles/openshift_master/tasks/main.yml | 30 +++++++ roles/openshift_master/vars/main.yml | 2 + roles/openshift_minion/README.md | 38 ++++++++ roles/openshift_minion/defaults/main.yml | 2 + roles/openshift_minion/handlers/main.yml | 4 + roles/openshift_minion/meta/main.yml | 124 +++++++++++++++++++++++++++ roles/openshift_minion/tasks/main.yml | 30 +++++++ roles/openshift_minion/vars/main.yml | 2 + roles/origin_master/README.md | 38 -------- roles/origin_master/defaults/main.yml | 2 - roles/origin_master/handlers/main.yml | 4 - roles/origin_master/meta/main.yml | 124 --------------------------- roles/origin_master/tasks/main.yml | 25 ------ roles/origin_master/vars/main.yml | 2 - roles/origin_minion/README.md | 38 -------- roles/origin_minion/defaults/main.yml | 2 - roles/origin_minion/handlers/main.yml | 4 - roles/origin_minion/meta/main.yml | 124 --------------------------- roles/origin_minion/tasks/main.yml | 24 ------ roles/origin_minion/vars/main.yml | 2 - 42 files changed, 661 insertions(+), 633 deletions(-) create mode 100644 .gitignore create mode 100644 playbooks/gce/openshift-master/config.yml create mode 100644 playbooks/gce/openshift-master/launch.yml create mode 100644 playbooks/gce/openshift-master/terminate.yml create mode 100644 playbooks/gce/openshift-master/vars.yml create mode 100644 playbooks/gce/openshift-minion/config.yml create mode 100644 playbooks/gce/openshift-minion/launch.yml create mode 100644 playbooks/gce/openshift-minion/terminate.yml create mode 100644 playbooks/gce/openshift-minion/vars.yml delete mode 100644 playbooks/gce/origin-master/config.yml delete mode 100644 playbooks/gce/origin-master/launch.yml delete mode 100644 playbooks/gce/origin-master/terminate.yml delete mode 100644 playbooks/gce/origin-master/vars.yml delete mode 100644 playbooks/gce/origin-minion/config.yml delete mode 100644 playbooks/gce/origin-minion/launch.yml delete mode 100644 playbooks/gce/origin-minion/terminate.yml delete mode 100644 playbooks/gce/origin-minion/vars.yml create mode 100644 roles/openshift_master/README.md create mode 100644 roles/openshift_master/defaults/main.yml create mode 100644 roles/openshift_master/handlers/main.yml create mode 100644 roles/openshift_master/meta/main.yml create mode 100644 roles/openshift_master/tasks/main.yml create mode 100644 roles/openshift_master/vars/main.yml create mode 100644 roles/openshift_minion/README.md create mode 100644 roles/openshift_minion/defaults/main.yml create mode 100644 roles/openshift_minion/handlers/main.yml create mode 100644 roles/openshift_minion/meta/main.yml create mode 100644 roles/openshift_minion/tasks/main.yml create mode 100644 roles/openshift_minion/vars/main.yml delete mode 100644 roles/origin_master/README.md delete mode 100644 roles/origin_master/defaults/main.yml delete mode 100644 roles/origin_master/handlers/main.yml delete mode 100644 roles/origin_master/meta/main.yml delete mode 100644 roles/origin_master/tasks/main.yml delete mode 100644 roles/origin_master/vars/main.yml delete mode 100644 roles/origin_minion/README.md delete mode 100644 roles/origin_minion/defaults/main.yml delete mode 100644 roles/origin_minion/handlers/main.yml delete mode 100644 roles/origin_minion/meta/main.yml delete mode 100644 roles/origin_minion/tasks/main.yml delete mode 100644 roles/origin_minion/vars/main.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9dcdf22c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +*~ +#*# +.idea +*.iml +*.komodoproject +.loadpath +.project +*.pyc +.pydevproject +*.pyo +*.redcar* +.*.swp +.sass-cache +.rvmrc +.DS_Store diff --git a/cluster.sh b/cluster.sh index 3aaabd07d..6363e1e8d 100755 --- a/cluster.sh +++ b/cluster.sh @@ -23,25 +23,27 @@ EOT # @formatter:on function create_cluser { + for (( i = 0; i < $MASTERS; i ++ )); do + ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MASTER_PLAYBOOK + done + for (( i = 0; i < $MINIONS; i ++ )); do ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MINION_PLAYBOOK done - for (( i = 0; i < $MASTERS; i ++ )); do - ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MASTER_PLAYBOOK - done update_cluster - echo -e "\nCreated ${MASTERS} ${MASTER_PLAYBOOK} masters and ${MINIONS} ${MINION_PLAYBOOK} minions using ${PROVIDER} provider\n" + + echo -e "\nCreated ${MASTERS}/${MASTER_PLAYBOOK} masters and ${MINIONS}/${MINION_PLAYBOOK} minions using ${PROVIDER} provider\n" } function update_cluster { - for (( i = 0; i < $MINIONS; i ++ )); do - ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MINION_PLAYBOOK - done - for (( i = 0; i < $MASTERS; i ++ )); do ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MASTER_PLAYBOOK done + + for (( i = 0; i < $MINIONS; i ++ )); do + ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MINION_PLAYBOOK + done } function terminate_cluster { diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml new file mode 100644 index 000000000..681f804cc --- /dev/null +++ b/playbooks/gce/openshift-master/config.yml @@ -0,0 +1,39 @@ +- 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: "Gather facts for minions in {{ oo_env }}" + hosts: "tag_env-host-type-{{ oo_env }}-openshift-minion" + connection: ssh + user: root + +- name: "Set Origin specific facts on localhost (for later use)" + hosts: localhost + gather_facts: no + tasks: + - name: Setting oo_minion_ips fact on localhost + set_fact: + oo_minion_ips: "{{ hostvars + | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-minion']) + | oo_collect(attribute='ansible_eth0.ipv4.address') }}" + when: groups['tag_env-host-type-' + oo_env + '-openshift-minion'] is defined + +- name: "Configure instances" + hosts: oo_hosts_to_config + connection: ssh + user: root + vars_files: + - vars.yml + roles: + - ../../../roles/base_os + - ../../../roles/repos + - { + role: ../../../roles/openshift_master, + oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}" + } + - ../../../roles/pods diff --git a/playbooks/gce/openshift-master/launch.yml b/playbooks/gce/openshift-master/launch.yml new file mode 100644 index 000000000..0a3ac3fdd --- /dev/null +++ b/playbooks/gce/openshift-master/launch.yml @@ -0,0 +1,38 @@ +--- +- name: Launch instance(s) + hosts: localhost + connection: local + gather_facts: no + + vars: + inst_names: "{{ oo_new_inst_names }}" + machine_type: n1-standard-1 + image: libra-rhel7 + + vars_files: + - vars.yml + + tasks: + - name: Launch instances + gce: + instance_names: "{{ inst_names }}" + machine_type: "{{ machine_type }}" + image: "{{ image }}" + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + tags: "{{ oo_new_inst_tags }}" + register: gce + + - name: Add new instances public IPs to oo_hosts_to_config + add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config" + with_items: gce.instance_data + + - name: Wait for ssh + wait_for: "port=22 host={{ item.public_ip }}" + with_items: gce.instance_data + + - debug: var=gce + +# Apply the configs, separate so that just the configs can be run by themselves +- include: config.yml diff --git a/playbooks/gce/openshift-master/terminate.yml b/playbooks/gce/openshift-master/terminate.yml new file mode 100644 index 000000000..76e1404b5 --- /dev/null +++ b/playbooks/gce/openshift-master/terminate.yml @@ -0,0 +1,41 @@ +- name: "populate oo_hosts_to_terminate host group if needed" + hosts: localhost + gather_facts: no + tasks: + - debug: var=oo_host_group_exp + + - name: Evaluate oo_host_group_exp if it's set + add_host: "name={{ item }} groups=oo_hosts_to_terminate" + with_items: "{{ oo_host_group_exp | default('') }}" + when: oo_host_group_exp is defined + + - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" + + +- name: Terminate instances + hosts: localhost + connection: local + tasks: + - name: Terminate master instances + gce: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + state: 'absent' + instance_names: "{{ groups['oo_hosts_to_terminate'] }}" + disks: "{{ groups['oo_hosts_to_terminate'] }}" + register: gce + + - debug: var=gce + + - name: Remove disks of instances + gce_pd: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + name: "{{ item }}" + zone: "{{ gce.zone }}" + state: absent + with_items: gce.instance_names + + diff --git a/playbooks/gce/openshift-master/vars.yml b/playbooks/gce/openshift-master/vars.yml new file mode 100644 index 000000000..e69de29bb diff --git a/playbooks/gce/openshift-minion/config.yml b/playbooks/gce/openshift-minion/config.yml new file mode 100644 index 000000000..0a92d41c7 --- /dev/null +++ b/playbooks/gce/openshift-minion/config.yml @@ -0,0 +1,39 @@ +- 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(['']) }}" + } diff --git a/playbooks/gce/openshift-minion/launch.yml b/playbooks/gce/openshift-minion/launch.yml new file mode 100644 index 000000000..0a3ac3fdd --- /dev/null +++ b/playbooks/gce/openshift-minion/launch.yml @@ -0,0 +1,38 @@ +--- +- name: Launch instance(s) + hosts: localhost + connection: local + gather_facts: no + + vars: + inst_names: "{{ oo_new_inst_names }}" + machine_type: n1-standard-1 + image: libra-rhel7 + + vars_files: + - vars.yml + + tasks: + - name: Launch instances + gce: + instance_names: "{{ inst_names }}" + machine_type: "{{ machine_type }}" + image: "{{ image }}" + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + tags: "{{ oo_new_inst_tags }}" + register: gce + + - name: Add new instances public IPs to oo_hosts_to_config + add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config" + with_items: gce.instance_data + + - name: Wait for ssh + wait_for: "port=22 host={{ item.public_ip }}" + with_items: gce.instance_data + + - debug: var=gce + +# Apply the configs, separate so that just the configs can be run by themselves +- include: config.yml diff --git a/playbooks/gce/openshift-minion/terminate.yml b/playbooks/gce/openshift-minion/terminate.yml new file mode 100644 index 000000000..97b31eca0 --- /dev/null +++ b/playbooks/gce/openshift-minion/terminate.yml @@ -0,0 +1,41 @@ +- name: "populate oo_hosts_to_terminate host group if needed" + hosts: localhost + gather_facts: no + tasks: + - debug: var=oo_host_group_exp + + - name: Evaluate oo_host_group_exp if it's set + add_host: "name={{ item }} groups=oo_hosts_to_terminate" + with_items: "{{ oo_host_group_exp | default('') }}" + when: oo_host_group_exp is defined + + - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" + + +- name: Terminate instances + hosts: localhost + connection: local + tasks: + - name: Terminate minion instances + gce: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + state: 'absent' + instance_names: "{{ groups['oo_hosts_to_terminate'] }}" + disks: "{{ groups['oo_hosts_to_terminate'] }}" + register: gce + + - debug: var=gce + + - name: Remove disks of instances + gce_pd: + service_account_email: "{{ gce_service_account_email }}" + pem_file: "{{ gce_pem_file }}" + project_id: "{{ gce_project_id }}" + name: "{{ item }}" + zone: "{{ gce.zone }}" + state: absent + with_items: gce.instance_names + + diff --git a/playbooks/gce/openshift-minion/vars.yml b/playbooks/gce/openshift-minion/vars.yml new file mode 100644 index 000000000..e69de29bb diff --git a/playbooks/gce/origin-master/config.yml b/playbooks/gce/origin-master/config.yml deleted file mode 100644 index 681f804cc..000000000 --- a/playbooks/gce/origin-master/config.yml +++ /dev/null @@ -1,39 +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: "Gather facts for minions in {{ oo_env }}" - hosts: "tag_env-host-type-{{ oo_env }}-openshift-minion" - connection: ssh - user: root - -- name: "Set Origin specific facts on localhost (for later use)" - hosts: localhost - gather_facts: no - tasks: - - name: Setting oo_minion_ips fact on localhost - set_fact: - oo_minion_ips: "{{ hostvars - | oo_select_keys(groups['tag_env-host-type-' + oo_env + '-openshift-minion']) - | oo_collect(attribute='ansible_eth0.ipv4.address') }}" - when: groups['tag_env-host-type-' + oo_env + '-openshift-minion'] is defined - -- name: "Configure instances" - hosts: oo_hosts_to_config - connection: ssh - user: root - vars_files: - - vars.yml - roles: - - ../../../roles/base_os - - ../../../roles/repos - - { - role: ../../../roles/openshift_master, - oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}" - } - - ../../../roles/pods diff --git a/playbooks/gce/origin-master/launch.yml b/playbooks/gce/origin-master/launch.yml deleted file mode 100644 index 0a3ac3fdd..000000000 --- a/playbooks/gce/origin-master/launch.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- name: Launch instance(s) - hosts: localhost - connection: local - gather_facts: no - - vars: - inst_names: "{{ oo_new_inst_names }}" - machine_type: n1-standard-1 - image: libra-rhel7 - - vars_files: - - vars.yml - - tasks: - - name: Launch instances - gce: - instance_names: "{{ inst_names }}" - machine_type: "{{ machine_type }}" - image: "{{ image }}" - service_account_email: "{{ gce_service_account_email }}" - pem_file: "{{ gce_pem_file }}" - project_id: "{{ gce_project_id }}" - tags: "{{ oo_new_inst_tags }}" - register: gce - - - name: Add new instances public IPs to oo_hosts_to_config - add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config" - with_items: gce.instance_data - - - name: Wait for ssh - wait_for: "port=22 host={{ item.public_ip }}" - with_items: gce.instance_data - - - debug: var=gce - -# Apply the configs, separate so that just the configs can be run by themselves -- include: config.yml diff --git a/playbooks/gce/origin-master/terminate.yml b/playbooks/gce/origin-master/terminate.yml deleted file mode 100644 index 76e1404b5..000000000 --- a/playbooks/gce/origin-master/terminate.yml +++ /dev/null @@ -1,41 +0,0 @@ -- name: "populate oo_hosts_to_terminate host group if needed" - hosts: localhost - gather_facts: no - tasks: - - debug: var=oo_host_group_exp - - - name: Evaluate oo_host_group_exp if it's set - add_host: "name={{ item }} groups=oo_hosts_to_terminate" - with_items: "{{ oo_host_group_exp | default('') }}" - when: oo_host_group_exp is defined - - - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" - - -- name: Terminate instances - hosts: localhost - connection: local - tasks: - - name: Terminate master instances - gce: - service_account_email: "{{ gce_service_account_email }}" - pem_file: "{{ gce_pem_file }}" - project_id: "{{ gce_project_id }}" - state: 'absent' - instance_names: "{{ groups['oo_hosts_to_terminate'] }}" - disks: "{{ groups['oo_hosts_to_terminate'] }}" - register: gce - - - debug: var=gce - - - name: Remove disks of instances - gce_pd: - service_account_email: "{{ gce_service_account_email }}" - pem_file: "{{ gce_pem_file }}" - project_id: "{{ gce_project_id }}" - name: "{{ item }}" - zone: "{{ gce.zone }}" - state: absent - with_items: gce.instance_names - - diff --git a/playbooks/gce/origin-master/vars.yml b/playbooks/gce/origin-master/vars.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/playbooks/gce/origin-minion/config.yml b/playbooks/gce/origin-minion/config.yml deleted file mode 100644 index 0a92d41c7..000000000 --- a/playbooks/gce/origin-minion/config.yml +++ /dev/null @@ -1,39 +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(['']) }}" - } diff --git a/playbooks/gce/origin-minion/launch.yml b/playbooks/gce/origin-minion/launch.yml deleted file mode 100644 index 0a3ac3fdd..000000000 --- a/playbooks/gce/origin-minion/launch.yml +++ /dev/null @@ -1,38 +0,0 @@ ---- -- name: Launch instance(s) - hosts: localhost - connection: local - gather_facts: no - - vars: - inst_names: "{{ oo_new_inst_names }}" - machine_type: n1-standard-1 - image: libra-rhel7 - - vars_files: - - vars.yml - - tasks: - - name: Launch instances - gce: - instance_names: "{{ inst_names }}" - machine_type: "{{ machine_type }}" - image: "{{ image }}" - service_account_email: "{{ gce_service_account_email }}" - pem_file: "{{ gce_pem_file }}" - project_id: "{{ gce_project_id }}" - tags: "{{ oo_new_inst_tags }}" - register: gce - - - name: Add new instances public IPs to oo_hosts_to_config - add_host: "hostname={{ item.name }} ansible_ssh_host={{ item.public_ip }} groupname=oo_hosts_to_config" - with_items: gce.instance_data - - - name: Wait for ssh - wait_for: "port=22 host={{ item.public_ip }}" - with_items: gce.instance_data - - - debug: var=gce - -# Apply the configs, separate so that just the configs can be run by themselves -- include: config.yml diff --git a/playbooks/gce/origin-minion/terminate.yml b/playbooks/gce/origin-minion/terminate.yml deleted file mode 100644 index 97b31eca0..000000000 --- a/playbooks/gce/origin-minion/terminate.yml +++ /dev/null @@ -1,41 +0,0 @@ -- name: "populate oo_hosts_to_terminate host group if needed" - hosts: localhost - gather_facts: no - tasks: - - debug: var=oo_host_group_exp - - - name: Evaluate oo_host_group_exp if it's set - add_host: "name={{ item }} groups=oo_hosts_to_terminate" - with_items: "{{ oo_host_group_exp | default('') }}" - when: oo_host_group_exp is defined - - - debug: msg="{{ groups['oo_hosts_to_terminate'] }}" - - -- name: Terminate instances - hosts: localhost - connection: local - tasks: - - name: Terminate minion instances - gce: - service_account_email: "{{ gce_service_account_email }}" - pem_file: "{{ gce_pem_file }}" - project_id: "{{ gce_project_id }}" - state: 'absent' - instance_names: "{{ groups['oo_hosts_to_terminate'] }}" - disks: "{{ groups['oo_hosts_to_terminate'] }}" - register: gce - - - debug: var=gce - - - name: Remove disks of instances - gce_pd: - service_account_email: "{{ gce_service_account_email }}" - pem_file: "{{ gce_pem_file }}" - project_id: "{{ gce_project_id }}" - name: "{{ item }}" - zone: "{{ gce.zone }}" - state: absent - with_items: gce.instance_names - - diff --git a/playbooks/gce/origin-minion/vars.yml b/playbooks/gce/origin-minion/vars.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/roles/openshift_master/README.md b/roles/openshift_master/README.md new file mode 100644 index 000000000..225dd44b9 --- /dev/null +++ b/roles/openshift_master/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml new file mode 100644 index 000000000..c7d14b676 --- /dev/null +++ b/roles/openshift_master/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for openshift_master diff --git a/roles/openshift_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml new file mode 100644 index 000000000..216af5dc9 --- /dev/null +++ b/roles/openshift_master/handlers/main.yml @@ -0,0 +1,4 @@ +--- +# handlers file for openshift_master +- name: restart openshift-master + service: name=openshift state=restarted diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml new file mode 100644 index 000000000..c5c362c60 --- /dev/null +++ b/roles/openshift_master/meta/main.yml @@ -0,0 +1,124 @@ +--- +galaxy_info: + author: your name + description: + company: your company (optional) + # Some suggested licenses: + # - BSD (default) + # - MIT + # - GPLv2 + # - GPLv3 + # - Apache + # - CC-BY + license: license (GPLv2, CC-BY, etc) + min_ansible_version: 1.2 + # + # Below are all platforms currently available. Just uncomment + # the ones that apply to your role. If you don't see your + # platform on this list, let us know and we'll get it added! + # + #platforms: + #- name: EL + # versions: + # - all + # - 5 + # - 6 + # - 7 + #- name: GenericUNIX + # versions: + # - all + # - any + #- name: Fedora + # versions: + # - all + # - 16 + # - 17 + # - 18 + # - 19 + # - 20 + #- name: opensuse + # versions: + # - all + # - 12.1 + # - 12.2 + # - 12.3 + # - 13.1 + # - 13.2 + #- name: Amazon + # versions: + # - all + # - 2013.03 + # - 2013.09 + #- name: GenericBSD + # versions: + # - all + # - any + #- name: FreeBSD + # versions: + # - all + # - 8.0 + # - 8.1 + # - 8.2 + # - 8.3 + # - 8.4 + # - 9.0 + # - 9.1 + # - 9.1 + # - 9.2 + #- name: Ubuntu + # versions: + # - all + # - lucid + # - maverick + # - natty + # - oneiric + # - precise + # - quantal + # - raring + # - saucy + # - trusty + #- name: SLES + # versions: + # - all + # - 10SP3 + # - 10SP4 + # - 11 + # - 11SP1 + # - 11SP2 + # - 11SP3 + #- name: GenericLinux + # versions: + # - all + # - any + #- name: Debian + # versions: + # - all + # - etch + # - lenny + # - squeeze + # - wheezy + # + # Below are all categories currently available. Just as with + # the platforms above, uncomment those that apply to your role. + # + #categories: + #- cloud + #- cloud:ec2 + #- cloud:gce + #- cloud:rax + #- clustering + #- database + #- database:nosql + #- database:sql + #- development + #- monitoring + #- networking + #- packaging + #- system + #- web +dependencies: [] + # List your role dependencies here, one per line. Only + # dependencies available via galaxy should be listed here. + # Be sure to remove the '[]' above if you add dependencies + # to this list. + diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml new file mode 100644 index 000000000..5a940c88a --- /dev/null +++ b/roles/openshift_master/tasks/main.yml @@ -0,0 +1,30 @@ +--- +# tasks file for openshift_master +- name: Install Origin + yum: pkg=origin state=installed + +- name: Configure Origin settings + lineinfile: > + dest=/etc/sysconfig/openshift + regexp={{ item.regex }} + line="{{ item.line }}" + with_items: + - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"' } + - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} + notify: + - restart openshift-master + +- name: Open firewalld port for etcd embedded in OpenShift + firewalld: port=4001/tcp permanent=false state=enabled + +- name: Save firewalld port for etcd embedded in + firewalld: port=4001/tcp permanent=true state=enabled + +- name: Open firewalld port for OpenShift + firewalld: port=8080/tcp permanent=false state=enabled + +- name: Save firewalld port for OpenShift + firewalld: port=8080/tcp permanent=true state=enabled + +- name: Enable OpenShift + service: name=openshift enabled=yes state=started diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml new file mode 100644 index 000000000..1f5cb46d6 --- /dev/null +++ b/roles/openshift_master/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for kubernetes_apiserver diff --git a/roles/openshift_minion/README.md b/roles/openshift_minion/README.md new file mode 100644 index 000000000..225dd44b9 --- /dev/null +++ b/roles/openshift_minion/README.md @@ -0,0 +1,38 @@ +Role Name +========= + +A brief description of the role goes here. + +Requirements +------------ + +Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. + +Role Variables +-------------- + +A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. + +Dependencies +------------ + +A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. + +Example Playbook +---------------- + +Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: + + - hosts: servers + roles: + - { role: username.rolename, x: 42 } + +License +------- + +BSD + +Author Information +------------------ + +An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/openshift_minion/defaults/main.yml b/roles/openshift_minion/defaults/main.yml new file mode 100644 index 000000000..dfcf3d98f --- /dev/null +++ b/roles/openshift_minion/defaults/main.yml @@ -0,0 +1,2 @@ +--- +# defaults file for openshift_minion diff --git a/roles/openshift_minion/handlers/main.yml b/roles/openshift_minion/handlers/main.yml new file mode 100644 index 000000000..2764456f4 --- /dev/null +++ b/roles/openshift_minion/handlers/main.yml @@ -0,0 +1,4 @@ +--- +# handlers file for openshift_minion +- name: restart openshift-minion + service: name=openshift state=restarted diff --git a/roles/openshift_minion/meta/main.yml b/roles/openshift_minion/meta/main.yml new file mode 100644 index 000000000..c5c362c60 --- /dev/null +++ b/roles/openshift_minion/meta/main.yml @@ -0,0 +1,124 @@ +--- +galaxy_info: + author: your name + description: + company: your company (optional) + # Some suggested licenses: + # - BSD (default) + # - MIT + # - GPLv2 + # - GPLv3 + # - Apache + # - CC-BY + license: license (GPLv2, CC-BY, etc) + min_ansible_version: 1.2 + # + # Below are all platforms currently available. Just uncomment + # the ones that apply to your role. If you don't see your + # platform on this list, let us know and we'll get it added! + # + #platforms: + #- name: EL + # versions: + # - all + # - 5 + # - 6 + # - 7 + #- name: GenericUNIX + # versions: + # - all + # - any + #- name: Fedora + # versions: + # - all + # - 16 + # - 17 + # - 18 + # - 19 + # - 20 + #- name: opensuse + # versions: + # - all + # - 12.1 + # - 12.2 + # - 12.3 + # - 13.1 + # - 13.2 + #- name: Amazon + # versions: + # - all + # - 2013.03 + # - 2013.09 + #- name: GenericBSD + # versions: + # - all + # - any + #- name: FreeBSD + # versions: + # - all + # - 8.0 + # - 8.1 + # - 8.2 + # - 8.3 + # - 8.4 + # - 9.0 + # - 9.1 + # - 9.1 + # - 9.2 + #- name: Ubuntu + # versions: + # - all + # - lucid + # - maverick + # - natty + # - oneiric + # - precise + # - quantal + # - raring + # - saucy + # - trusty + #- name: SLES + # versions: + # - all + # - 10SP3 + # - 10SP4 + # - 11 + # - 11SP1 + # - 11SP2 + # - 11SP3 + #- name: GenericLinux + # versions: + # - all + # - any + #- name: Debian + # versions: + # - all + # - etch + # - lenny + # - squeeze + # - wheezy + # + # Below are all categories currently available. Just as with + # the platforms above, uncomment those that apply to your role. + # + #categories: + #- cloud + #- cloud:ec2 + #- cloud:gce + #- cloud:rax + #- clustering + #- database + #- database:nosql + #- database:sql + #- development + #- monitoring + #- networking + #- packaging + #- system + #- web +dependencies: [] + # List your role dependencies here, one per line. Only + # dependencies available via galaxy should be listed here. + # Be sure to remove the '[]' above if you add dependencies + # to this list. + diff --git a/roles/openshift_minion/tasks/main.yml b/roles/openshift_minion/tasks/main.yml new file mode 100644 index 000000000..c43575945 --- /dev/null +++ b/roles/openshift_minion/tasks/main.yml @@ -0,0 +1,30 @@ +--- +# tasks file for openshift_minion +- name: Install OpenShift + yum: pkg=origin state=installed + +- name: Configure OpenShift settings + lineinfile: > + dest=/etc/sysconfig/openshift + regexp={{ item.regex }} + line="{{ item.line }}" + with_items: + - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_master_ips[0] }}\"' } + - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} + notify: + - restart openshift-minion + +- name: Open firewalld port for OpenShift + firewalld: port=10250/tcp permanent=false state=enabled + +- name: Save firewalld port for OpenShift + firewalld: port=10250/tcp permanent=true state=enabled + + # POST ${master_ip}:8080/api/v1beta1/minions kind=Minion id=${node_ip} apiVersion=v1beta1 hostIP=${node_ip} >/dev/null + +- name: Enable OpenShift + service: name=openshift enabled=yes state=started + +- name: Register with OpenShift master + command: "curl -X POST -H 'Accept: application/json' -d '{\"kind\":\"Minion\", \"id\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\", \"apiVersion\":\"v1beta1\", \"hostIP\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\" }' http://{{ oo_master_ips[0] }}:8080/api/v1beta1/minions" + when: oo_master_ips[0] != '' diff --git a/roles/openshift_minion/vars/main.yml b/roles/openshift_minion/vars/main.yml new file mode 100644 index 000000000..715fba487 --- /dev/null +++ b/roles/openshift_minion/vars/main.yml @@ -0,0 +1,2 @@ +--- +# vars file for openshift_minion diff --git a/roles/origin_master/README.md b/roles/origin_master/README.md deleted file mode 100644 index 225dd44b9..000000000 --- a/roles/origin_master/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/origin_master/defaults/main.yml b/roles/origin_master/defaults/main.yml deleted file mode 100644 index c7d14b676..000000000 --- a/roles/origin_master/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for openshift_master diff --git a/roles/origin_master/handlers/main.yml b/roles/origin_master/handlers/main.yml deleted file mode 100644 index 216af5dc9..000000000 --- a/roles/origin_master/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# handlers file for openshift_master -- name: restart openshift-master - service: name=openshift state=restarted diff --git a/roles/origin_master/meta/main.yml b/roles/origin_master/meta/main.yml deleted file mode 100644 index c5c362c60..000000000 --- a/roles/origin_master/meta/main.yml +++ /dev/null @@ -1,124 +0,0 @@ ---- -galaxy_info: - author: your name - description: - company: your company (optional) - # Some suggested licenses: - # - BSD (default) - # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY - license: license (GPLv2, CC-BY, etc) - min_ansible_version: 1.2 - # - # Below are all platforms currently available. Just uncomment - # the ones that apply to your role. If you don't see your - # platform on this list, let us know and we'll get it added! - # - #platforms: - #- name: EL - # versions: - # - all - # - 5 - # - 6 - # - 7 - #- name: GenericUNIX - # versions: - # - all - # - any - #- name: Fedora - # versions: - # - all - # - 16 - # - 17 - # - 18 - # - 19 - # - 20 - #- name: opensuse - # versions: - # - all - # - 12.1 - # - 12.2 - # - 12.3 - # - 13.1 - # - 13.2 - #- name: Amazon - # versions: - # - all - # - 2013.03 - # - 2013.09 - #- name: GenericBSD - # versions: - # - all - # - any - #- name: FreeBSD - # versions: - # - all - # - 8.0 - # - 8.1 - # - 8.2 - # - 8.3 - # - 8.4 - # - 9.0 - # - 9.1 - # - 9.1 - # - 9.2 - #- name: Ubuntu - # versions: - # - all - # - lucid - # - maverick - # - natty - # - oneiric - # - precise - # - quantal - # - raring - # - saucy - # - trusty - #- name: SLES - # versions: - # - all - # - 10SP3 - # - 10SP4 - # - 11 - # - 11SP1 - # - 11SP2 - # - 11SP3 - #- name: GenericLinux - # versions: - # - all - # - any - #- name: Debian - # versions: - # - all - # - etch - # - lenny - # - squeeze - # - wheezy - # - # Below are all categories currently available. Just as with - # the platforms above, uncomment those that apply to your role. - # - #categories: - #- cloud - #- cloud:ec2 - #- cloud:gce - #- cloud:rax - #- clustering - #- database - #- database:nosql - #- database:sql - #- development - #- monitoring - #- networking - #- packaging - #- system - #- web -dependencies: [] - # List your role dependencies here, one per line. Only - # dependencies available via galaxy should be listed here. - # Be sure to remove the '[]' above if you add dependencies - # to this list. - diff --git a/roles/origin_master/tasks/main.yml b/roles/origin_master/tasks/main.yml deleted file mode 100644 index 3963b5090..000000000 --- a/roles/origin_master/tasks/main.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# tasks file for openshift_master -- name: Install Origin - yum: pkg=openshift state=installed - -- name: Configure Origin settings - lineinfile: > - dest=/etc/sysconfig/openshift - regexp={{ item.regex }} - line="{{ item.line }}" - with_items: - - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"' } - - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} - notify: - - restart openshift-master - -- name: Enable OpenShift - service: name=openshift enabled=yes state=started - -- name: Open firewalld port for Origin - firewalld: port=8080/tcp permanent=false state=enabled - -- name: Save firewalld port for Origin - firewalld: port=8080/tcp permanent=true state=enabled - diff --git a/roles/origin_master/vars/main.yml b/roles/origin_master/vars/main.yml deleted file mode 100644 index 1f5cb46d6..000000000 --- a/roles/origin_master/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for kubernetes_apiserver diff --git a/roles/origin_minion/README.md b/roles/origin_minion/README.md deleted file mode 100644 index 225dd44b9..000000000 --- a/roles/origin_minion/README.md +++ /dev/null @@ -1,38 +0,0 @@ -Role Name -========= - -A brief description of the role goes here. - -Requirements ------------- - -Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required. - -Role Variables --------------- - -A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well. - -Dependencies ------------- - -A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles. - -Example Playbook ----------------- - -Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too: - - - hosts: servers - roles: - - { role: username.rolename, x: 42 } - -License -------- - -BSD - -Author Information ------------------- - -An optional section for the role authors to include contact information, or a website (HTML is not allowed). diff --git a/roles/origin_minion/defaults/main.yml b/roles/origin_minion/defaults/main.yml deleted file mode 100644 index dfcf3d98f..000000000 --- a/roles/origin_minion/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# defaults file for openshift_minion diff --git a/roles/origin_minion/handlers/main.yml b/roles/origin_minion/handlers/main.yml deleted file mode 100644 index 2764456f4..000000000 --- a/roles/origin_minion/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -# handlers file for openshift_minion -- name: restart openshift-minion - service: name=openshift state=restarted diff --git a/roles/origin_minion/meta/main.yml b/roles/origin_minion/meta/main.yml deleted file mode 100644 index c5c362c60..000000000 --- a/roles/origin_minion/meta/main.yml +++ /dev/null @@ -1,124 +0,0 @@ ---- -galaxy_info: - author: your name - description: - company: your company (optional) - # Some suggested licenses: - # - BSD (default) - # - MIT - # - GPLv2 - # - GPLv3 - # - Apache - # - CC-BY - license: license (GPLv2, CC-BY, etc) - min_ansible_version: 1.2 - # - # Below are all platforms currently available. Just uncomment - # the ones that apply to your role. If you don't see your - # platform on this list, let us know and we'll get it added! - # - #platforms: - #- name: EL - # versions: - # - all - # - 5 - # - 6 - # - 7 - #- name: GenericUNIX - # versions: - # - all - # - any - #- name: Fedora - # versions: - # - all - # - 16 - # - 17 - # - 18 - # - 19 - # - 20 - #- name: opensuse - # versions: - # - all - # - 12.1 - # - 12.2 - # - 12.3 - # - 13.1 - # - 13.2 - #- name: Amazon - # versions: - # - all - # - 2013.03 - # - 2013.09 - #- name: GenericBSD - # versions: - # - all - # - any - #- name: FreeBSD - # versions: - # - all - # - 8.0 - # - 8.1 - # - 8.2 - # - 8.3 - # - 8.4 - # - 9.0 - # - 9.1 - # - 9.1 - # - 9.2 - #- name: Ubuntu - # versions: - # - all - # - lucid - # - maverick - # - natty - # - oneiric - # - precise - # - quantal - # - raring - # - saucy - # - trusty - #- name: SLES - # versions: - # - all - # - 10SP3 - # - 10SP4 - # - 11 - # - 11SP1 - # - 11SP2 - # - 11SP3 - #- name: GenericLinux - # versions: - # - all - # - any - #- name: Debian - # versions: - # - all - # - etch - # - lenny - # - squeeze - # - wheezy - # - # Below are all categories currently available. Just as with - # the platforms above, uncomment those that apply to your role. - # - #categories: - #- cloud - #- cloud:ec2 - #- cloud:gce - #- cloud:rax - #- clustering - #- database - #- database:nosql - #- database:sql - #- development - #- monitoring - #- networking - #- packaging - #- system - #- web -dependencies: [] - # List your role dependencies here, one per line. Only - # dependencies available via galaxy should be listed here. - # Be sure to remove the '[]' above if you add dependencies - # to this list. - diff --git a/roles/origin_minion/tasks/main.yml b/roles/origin_minion/tasks/main.yml deleted file mode 100644 index 3bb62b438..000000000 --- a/roles/origin_minion/tasks/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -# tasks file for openshift_minion -- name: Install OpenShift - yum: pkg=openshift state=installed - -- name: Configure OpenShift settings - lineinfile: > - dest=/etc/sysconfig/openshift - regexp={{ item.regex }} - line="{{ item.line }}" - with_items: - - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_master_ips[0] }}\"' } - - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} - notify: - - restart openshift-minion - -- name: Enable OpenShift - service: name=openshift enabled=yes state=started - -- name: Open firewalld port for OpenShift - firewalld: port=10250/tcp permanent=false state=enabled - -- name: Save firewalld port for OpenShift - firewalld: port=10250/tcp permanent=true state=enabled diff --git a/roles/origin_minion/vars/main.yml b/roles/origin_minion/vars/main.yml deleted file mode 100644 index 715fba487..000000000 --- a/roles/origin_minion/vars/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -# vars file for openshift_minion -- cgit v1.2.3 From b00727520bc903efc02ece721c3500e599f18b75 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Fri, 3 Oct 2014 15:16:18 -0700 Subject: WIP Infra - Use variables in roles --- playbooks/gce/openshift-master/config.yml | 3 ++- playbooks/gce/openshift-minion/config.yml | 3 ++- roles/openshift_master/tasks/main.yml | 4 ++-- roles/openshift_minion/tasks/main.yml | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml index 681f804cc..f705bb305 100644 --- a/playbooks/gce/openshift-master/config.yml +++ b/playbooks/gce/openshift-master/config.yml @@ -34,6 +34,7 @@ - ../../../roles/repos - { role: ../../../roles/openshift_master, - oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}" + oo_minion_ips: "{{ hostvars['localhost'].oo_minion_ips | default(['']) }}", + oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}" } - ../../../roles/pods diff --git a/playbooks/gce/openshift-minion/config.yml b/playbooks/gce/openshift-minion/config.yml index 0a92d41c7..0f78d4c76 100644 --- a/playbooks/gce/openshift-minion/config.yml +++ b/playbooks/gce/openshift-minion/config.yml @@ -35,5 +35,6 @@ - ../../../roles/docker - { role: ../../../roles/openshift_minion, - oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}" + oo_master_ips: "{{ hostvars['localhost'].oo_master_ips | default(['']) }}", + oo_bind_ip: "{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address | default(['']) }}" } diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 5a940c88a..83573cb27 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -9,8 +9,8 @@ regexp={{ item.regex }} line="{{ item.line }}" with_items: - - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"' } - - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} + - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_bind_ip }}\"' } + - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ oo_bind_ip }}\"'} notify: - restart openshift-master diff --git a/roles/openshift_minion/tasks/main.yml b/roles/openshift_minion/tasks/main.yml index c43575945..2b1f5332e 100644 --- a/roles/openshift_minion/tasks/main.yml +++ b/roles/openshift_minion/tasks/main.yml @@ -10,7 +10,7 @@ line="{{ item.line }}" with_items: - { regex: '^OPENSHIFT_MASTER', line: 'OPENSHIFT_MASTER=\"{{ oo_master_ips[0] }}\"' } - - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\"'} + - { regex: '^OPENSHIFT_BIND_ADDR', line: 'OPENSHIFT_BIND_ADDR=\"{{ oo_bind_ip }}\"'} notify: - restart openshift-minion @@ -26,5 +26,5 @@ service: name=openshift enabled=yes state=started - name: Register with OpenShift master - command: "curl -X POST -H 'Accept: application/json' -d '{\"kind\":\"Minion\", \"id\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\", \"apiVersion\":\"v1beta1\", \"hostIP\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\" }' http://{{ oo_master_ips[0] }}:8080/api/v1beta1/minions" + command: "curl -X POST -H 'Accept: application/json' -d '{\"kind\":\"Minion\", \"id\":\"{{ oo_bind_ip }}\", \"apiVersion\":\"v1beta1\", \"hostIP\":\"{{ oo_bind_ip }}\" }' http://{{ oo_master_ips[0] }}:8080/api/v1beta1/minions" when: oo_master_ips[0] != '' -- cgit v1.2.3