diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/flannel/handlers/main.yml | 4 | ||||
| -rw-r--r-- | roles/flannel/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/flannel_register/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/kube_nfs_volumes/README.md | 2 | ||||
| -rw-r--r-- | roles/nuage_master/handlers/main.yaml | 2 | ||||
| -rw-r--r-- | roles/nuage_master/tasks/main.yaml | 10 | ||||
| -rw-r--r-- | roles/nuage_node/handlers/main.yaml | 4 | ||||
| -rw-r--r-- | roles/nuage_node/tasks/main.yaml | 14 | ||||
| -rw-r--r-- | roles/openshift_expand_partition/README.md | 4 | ||||
| -rw-r--r-- | roles/openshift_storage_nfs_lvm/README.md | 4 | 
10 files changed, 31 insertions, 31 deletions
diff --git a/roles/flannel/handlers/main.yml b/roles/flannel/handlers/main.yml index f9b9ae7f1..981ea5c7a 100644 --- a/roles/flannel/handlers/main.yml +++ b/roles/flannel/handlers/main.yml @@ -1,8 +1,8 @@  ---  - name: restart flanneld -  sudo: true +  become: yes    service: name=flanneld state=restarted  - name: restart docker -  sudo: true +  become: yes    service: name=docker state=restarted diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index aa27b674e..6b6dfb423 100644 --- a/roles/flannel/tasks/main.yml +++ b/roles/flannel/tasks/main.yml @@ -1,11 +1,11 @@  ---  - name: Install flannel -  sudo: true +  become: yes    action: "{{ ansible_pkg_mgr }} name=flannel state=present"    when: not openshift.common.is_containerized | bool  - name: Set flannel etcd url -  sudo: true +  become: yes    lineinfile:      dest: /etc/sysconfig/flanneld      backrefs: yes @@ -13,7 +13,7 @@      line: '\1{{ etcd_hosts|join(",") }}'  - name: Set flannel etcd key -  sudo: true +  become: yes    lineinfile:      dest: /etc/sysconfig/flanneld      backrefs: yes @@ -21,7 +21,7 @@      line: '\1{{ flannel_etcd_key }}'  - name: Set flannel options -  sudo: true +  become: yes    lineinfile:      dest: /etc/sysconfig/flanneld      backrefs: yes @@ -29,7 +29,7 @@      line: '\1--iface {{ flannel_interface }} --etcd-cafile={{ etcd_peer_ca_file }} --etcd-keyfile={{ etcd_peer_key_file }} --etcd-certfile={{ etcd_peer_cert_file }}'  - name: Enable flanneld -  sudo: true +  become: yes    service:      name: flanneld      state: started @@ -37,7 +37,7 @@    register: start_result  - name: Remove docker bridge ip -  sudo: true +  become: yes    shell: ip a del `ip a show docker0 | grep "inet[[:space:]]" | awk '{print $2}'` dev docker0    notify:      - restart docker diff --git a/roles/flannel_register/tasks/main.yml b/roles/flannel_register/tasks/main.yml index 1629157c8..845b7ef40 100644 --- a/roles/flannel_register/tasks/main.yml +++ b/roles/flannel_register/tasks/main.yml @@ -1,14 +1,14 @@  ---  - name: Assures /etc/flannel dir exists -  sudo: true +  become: yes    file: path=/etc/flannel state=directory  - name: Generate etcd configuration for etcd -  sudo: true +  become: yes    template:      src: "flannel-config.json"      dest: "/etc/flannel/config.json"  - name: Insert flannel configuration into etcd -  sudo: true +  become: yes    command: 'curl -L --cacert "{{ etcd_peer_ca_file }}" --cert "{{ etcd_peer_cert_file }}" --key "{{ etcd_peer_key_file }}" "{{ etcd_hosts[0] }}/v2/keys{{ flannel_etcd_key }}/config" -XPUT --data-urlencode value@/etc/flannel/config.json' diff --git a/roles/kube_nfs_volumes/README.md b/roles/kube_nfs_volumes/README.md index 1520f79b2..dd91ad8b1 100644 --- a/roles/kube_nfs_volumes/README.md +++ b/roles/kube_nfs_volumes/README.md @@ -94,7 +94,7 @@ partitions.  * Create an ansible playbook, say `setupnfs.yaml`:      ```      - hosts: nfsservers -      sudo: yes +      become: yes        roles:           - role: kube_nfs_volumes             disks: "/dev/sdb,/dev/sdc" diff --git a/roles/nuage_master/handlers/main.yaml b/roles/nuage_master/handlers/main.yaml index 5d133cf16..56224cf82 100644 --- a/roles/nuage_master/handlers/main.yaml +++ b/roles/nuage_master/handlers/main.yaml @@ -1,6 +1,6 @@  ---  - name: restart nuage-openshift-monitor -  sudo: true +  become: yes    service: name=nuage-openshift-monitor state=restarted  - name: restart master diff --git a/roles/nuage_master/tasks/main.yaml b/roles/nuage_master/tasks/main.yaml index c71f3072c..b8eaede3b 100644 --- a/roles/nuage_master/tasks/main.yaml +++ b/roles/nuage_master/tasks/main.yaml @@ -1,20 +1,20 @@  ---  - name: Create directory /usr/share/nuage-openshift-monitor -  sudo: true +  become: yes    file: path=/usr/share/nuage-openshift-monitor state=directory    - name: Create the log directory -  sudo: true +  become: yes    file: path={{ nuage_mon_rest_server_logdir }} state=directory  - name: Install Nuage Openshift Monitor  -  sudo: true +  become: yes    yum: name={{ nuage_openshift_rpm }} state=present  - include: serviceaccount.yml  - name: Download the certs and keys -  sudo: true +  become: yes    fetch: src={{ cert_output_dir }}/{{ item }} dest=/tmp/{{ item }} flat=yes    with_items:          - ca.crt @@ -25,7 +25,7 @@  - include: certificates.yml   - name: Create nuage-openshift-monitor.yaml -  sudo: true +  become: yes    template: src=nuage-openshift-monitor.j2 dest=/usr/share/nuage-openshift-monitor/nuage-openshift-monitor.yaml owner=root mode=0644    notify:      - restart master diff --git a/roles/nuage_node/handlers/main.yaml b/roles/nuage_node/handlers/main.yaml index 25482a845..5f2b97ae2 100644 --- a/roles/nuage_node/handlers/main.yaml +++ b/roles/nuage_node/handlers/main.yaml @@ -1,8 +1,8 @@  ---  - name: restart vrs -  sudo: true +  become: yes    service: name=openvswitch state=restarted  - name: restart node -  sudo: true +  become: yes    service: name={{ openshift.common.service_type }}-node state=restarted diff --git a/roles/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml index d7dd53802..1146573d3 100644 --- a/roles/nuage_node/tasks/main.yaml +++ b/roles/nuage_node/tasks/main.yaml @@ -1,27 +1,27 @@  ---  - name: Install Nuage VRS -  sudo: true +  become: yes    yum: name={{ vrs_rpm }} state=present  - name: Set the uplink interface  -  sudo: true +  become: yes    lineinfile: dest={{ vrs_config }} regexp=^NETWORK_UPLINK_INTF line='NETWORK_UPLINK_INTF={{ uplink_interface }}'  - name: Set the Active Controller  -  sudo: true +  become: yes    lineinfile: dest={{ vrs_config }} regexp=^ACTIVE_CONTROLLER line='ACTIVE_CONTROLLER={{ vsc_active_ip }}'  - name: Set the Standby Controller  -  sudo: true +  become: yes    lineinfile: dest={{ vrs_config }} regexp=^STANDBY_CONTROLLER line='STANDBY_CONTROLLER={{ vsc_standby_ip }}'    when: vsc_standby_ip is defined  - name: Install plugin rpm -  sudo: true +  become: yes    yum: name={{ plugin_rpm }} state=present  - name: Copy the certificates and keys -  sudo: true +  become: yes    copy: src="/tmp/{{ item }}" dest="{{ vsp_openshift_dir }}/{{ item }}"    with_items:          - ca.crt @@ -32,7 +32,7 @@  - include: certificates.yml  - name: Set the vsp-openshift.yaml  -  sudo: true +  become: yes    template: src=vsp-openshift.j2 dest={{ vsp_openshift_yaml }} owner=root mode=0644     notify:      - restart vrs diff --git a/roles/openshift_expand_partition/README.md b/roles/openshift_expand_partition/README.md index aed4ec871..c9c7b378c 100644 --- a/roles/openshift_expand_partition/README.md +++ b/roles/openshift_expand_partition/README.md @@ -45,7 +45,7 @@ space on /dev/xvda, and the file system will be expanded to fill the new  partition space.      - hosts: mynodes -      sudo: no +      become: no        remote_user: root        gather_facts: no        roles: @@ -68,7 +68,7 @@ partition space.  * Create an ansible playbook, say `expandvar.yaml`:      ```      - hosts: mynodes -      sudo: no +      become: no        remote_user: root        gather_facts: no        roles: diff --git a/roles/openshift_storage_nfs_lvm/README.md b/roles/openshift_storage_nfs_lvm/README.md index 1ee02e18a..3680ef5b5 100644 --- a/roles/openshift_storage_nfs_lvm/README.md +++ b/roles/openshift_storage_nfs_lvm/README.md @@ -62,7 +62,7 @@ Both of them are mounted into `/exports/openshift` directory.  Both directories  exported via NFS.  json files are created in /root.      - hosts: nfsservers -      sudo: no +      become: no        remote_user: root        gather_facts: no        roles: @@ -87,7 +87,7 @@ exported via NFS.  json files are created in /root.  * Create an ansible playbook, say `setupnfs.yaml`:      ```      - hosts: nfsservers -      sudo: no +      become: no        remote_user: root        gather_facts: no        roles:  | 
