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. --- 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 + 15 files changed, 399 insertions(+), 1 deletion(-) 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 (limited to 'roles') 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