diff options
author | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 10:16:20 -0500 |
---|---|---|
committer | Matt Woodson <mwoodson@redhat.com> | 2015-02-24 10:16:20 -0500 |
commit | 41ad58a9b9cd59eb5d8bece20d0c1073190d67b4 (patch) | |
tree | 7f11cf6a031a5c8b0efe9618c7ec3476c39fcbb8 /roles/openshift_minion/tasks/main.yml | |
parent | f780d4fa01a1e8b1559d31a7065715317a884ec4 (diff) | |
parent | 0d0b7fa2bba160e8d04ba0f67a0de5c7a06499db (diff) | |
download | openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.gz openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.bz2 openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.tar.xz openshift-41ad58a9b9cd59eb5d8bece20d0c1073190d67b4.zip |
Merge branch 'master' into tower_install
Conflicts:
lib/aws_command.rb
Diffstat (limited to 'roles/openshift_minion/tasks/main.yml')
-rw-r--r-- | roles/openshift_minion/tasks/main.yml | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/roles/openshift_minion/tasks/main.yml b/roles/openshift_minion/tasks/main.yml deleted file mode 100644 index 3821277bc..000000000 --- a/roles/openshift_minion/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -# tasks file for openshift_minion -- name: Install OpenShift - yum: pkg=origin state=installed - - # fixme: Once openshift stops resolving hostnames for minion queries remove this... -- name: Set hostname to IP Addr (WORKAROUND) - command: /usr/bin/hostname {{ oo_bind_ip }} - -- name: Configure OpenShift Minion settings - lineinfile: - dest: /etc/sysconfig/openshift - regexp: "{{ item.regex }}" - line: "{{ item.line }}" - with_items: - - { regex: '^ROLE=', line: 'ROLE=\"node\"' } - - { regex: '^OPTIONS=', line: 'OPTIONS=\"--master=http://{{ oo_master_ips[0] }}:8080 --loglevel=5\"' } - 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 - -- name: Enable OpenShift - service: name=openshift enabled=yes state=started - |