diff options
Diffstat (limited to 'playbooks/openstack')
| -rw-r--r-- | playbooks/openstack/openshift-cluster/dns.yml | 4 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/launch.yml | 10 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/list.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/terminate.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/update.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/vars.yml | 6 | 
6 files changed, 13 insertions, 13 deletions
| diff --git a/playbooks/openstack/openshift-cluster/dns.yml b/playbooks/openstack/openshift-cluster/dns.yml index 5e7671a48..02bcb0953 100644 --- a/playbooks/openstack/openshift-cluster/dns.yml +++ b/playbooks/openstack/openshift-cluster/dns.yml @@ -12,7 +12,7 @@        name: "{{ item }}"        groups: oo_dns_hosts_to_update        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"      with_items: "{{ groups[cluster_id ~ '-dns'] }}"    - name: Evaluate oo_hosts_to_add_in_dns @@ -20,7 +20,7 @@        name: "{{ item }}"        groups: oo_hosts_to_add_in_dns        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"      with_items: "{{ groups['tag_clusterid_' ~ cluster_id] }}"  - name: Gather facts diff --git a/playbooks/openstack/openshift-cluster/launch.yml b/playbooks/openstack/openshift-cluster/launch.yml index 0afcad72e..a5b6dc8d9 100644 --- a/playbooks/openstack/openshift-cluster/launch.yml +++ b/playbooks/openstack/openshift-cluster/launch.yml @@ -106,7 +106,7 @@        hostname: '{{ item[0] }}'        ansible_ssh_host: '{{ item[2] }}'        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"        groups: 'tag_environment_{{ cluster_env }}, tag_host-type_etcd, tag_sub-host-type_default, tag_clusterid_{{ cluster_id }}'        openshift_node_labels:          type: "etcd" @@ -120,7 +120,7 @@        hostname: '{{ item[0] }}'        ansible_ssh_host: '{{ item[2] }}'        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"        groups: 'tag_environment_{{ cluster_env }}, tag_host-type_master, tag_sub-host-type_default, tag_clusterid_{{ cluster_id }}'        openshift_node_labels:          type: "master" @@ -134,7 +134,7 @@        hostname: '{{ item[0] }}'        ansible_ssh_host: '{{ item[2] }}'        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"        groups: 'tag_environment_{{ cluster_env }}, tag_host-type_node, tag_sub-host-type_compute, tag_clusterid_{{ cluster_id }}'        openshift_node_labels:          type: "compute" @@ -148,7 +148,7 @@        hostname: '{{ item[0] }}'        ansible_ssh_host: '{{ item[2] }}'        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"        groups: 'tag_environment_{{ cluster_env }}, tag_host-type_node, tag_sub-host-type_infra, tag_clusterid_{{ cluster_id }}'        openshift_node_labels:          type: "infra" @@ -162,7 +162,7 @@        hostname: '{{ parsed_outputs.dns_name }}'        ansible_ssh_host: '{{ parsed_outputs.dns_floating_ip }}'        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"        groups: '{{ cluster_id }}-dns'    - name: Wait for ssh diff --git a/playbooks/openstack/openshift-cluster/list.yml b/playbooks/openstack/openshift-cluster/list.yml index 123ebd323..78ee3328b 100644 --- a/playbooks/openstack/openshift-cluster/list.yml +++ b/playbooks/openstack/openshift-cluster/list.yml @@ -16,7 +16,7 @@        groups: oo_list_hosts        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}"        ansible_ssh_host: "{{ hostvars[item].ansible_ssh_host | default(item) }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"      with_items: groups[scratch_group] | default([]) | difference(['localhost'])  - name: List Hosts diff --git a/playbooks/openstack/openshift-cluster/terminate.yml b/playbooks/openstack/openshift-cluster/terminate.yml index a1fb41b53..063d775e1 100644 --- a/playbooks/openstack/openshift-cluster/terminate.yml +++ b/playbooks/openstack/openshift-cluster/terminate.yml @@ -10,7 +10,7 @@        name: "{{ item }}"        groups: oo_hosts_to_terminate        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"      with_items: (groups['tag_environment_' ~ cluster_env]|default([])) | intersect(groups['tag_clusterid_' ~ cluster_id ]|default([]))  - name: Unsubscribe VMs diff --git a/playbooks/openstack/openshift-cluster/update.yml b/playbooks/openstack/openshift-cluster/update.yml index 16027b15c..78ba7fbec 100644 --- a/playbooks/openstack/openshift-cluster/update.yml +++ b/playbooks/openstack/openshift-cluster/update.yml @@ -15,7 +15,7 @@        name: "{{ item }}"        groups: oo_hosts_to_update        ansible_ssh_user: "{{ deployment_vars[deployment_type].ssh_user }}" -      ansible_sudo: "{{ deployment_vars[deployment_type].sudo }}" +      ansible_become: "{{ deployment_vars[deployment_type].sudo }}"      with_items: "{{ g_all_hosts | default([]) }}"  - include: ../../common/openshift-cluster/update_repos_and_packages.yml diff --git a/playbooks/openstack/openshift-cluster/vars.yml b/playbooks/openstack/openshift-cluster/vars.yml index ee26d223e..d45ab6b9e 100644 --- a/playbooks/openstack/openshift-cluster/vars.yml +++ b/playbooks/openstack/openshift-cluster/vars.yml @@ -21,17 +21,17 @@ openstack_flavor:  deployment_rhel7_ent_base:    image: "{{ lookup('oo_option', 'image_name') | default('rhel-guest-image-7.2-20151102.0.x86_64', True) }}"    ssh_user: openshift -  sudo: yes +  become: yes  deployment_vars:    origin:      image: "{{ lookup('oo_option', 'image_name') | default('centos-70-raw', True) }}"      ssh_user: openshift -    sudo: yes +    become: yes    online:      image:      ssh_user: root -    sudo: no +    become: no    enterprise: "{{ deployment_rhel7_ent_base }}"    openshift-enterprise: "{{ deployment_rhel7_ent_base }}"    atomic-enterprise: "{{ deployment_rhel7_ent_base }}" | 
