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/kubernetes_proxy/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/kubernetes_proxy/tasks/main.yml')
| -rw-r--r-- | roles/kubernetes_proxy/tasks/main.yml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/roles/kubernetes_proxy/tasks/main.yml b/roles/kubernetes_proxy/tasks/main.yml deleted file mode 100644 index 407c9ab46..000000000 --- a/roles/kubernetes_proxy/tasks/main.yml +++ /dev/null @@ -1,17 +0,0 @@ ---- -# tasks file for kubernetes_proxy -- name: Install kubernetes - yum: pkg=kubernetes state=installed - -- name: Configure kubernetes-proxy etcd servers - lineinfile: - dest: /etc/sysconfig/kubernetes - regexp: "{{ item.regex }}" - line: "{{ item.line }}" - with_items: - - { regex: '^KUBE_ETCD_SERVERS=', line: 'KUBE_ETCD_SERVERS=\"http://{{ oo_master_ips[0] }}:4001\"' } - notify: - - restart kubernetes-proxy - -- name: Enable proxy - service: name=kubernetes-proxy enabled=yes state=started |