diff options
| author | Tim Bielawa <timbielawa@gmail.com> | 2016-12-12 11:39:44 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-12 11:39:44 -0800 |
| commit | 7374505de2a11b94d22672b8da7e405b919a15bc (patch) | |
| tree | 51881c3f16f1f7368bdbf62e0478a6c292a5470a /playbooks/common/openshift-master | |
| parent | 91fba8015e9e8035cca2444dbbc8954a27e2310e (diff) | |
| parent | be97433dd559a3bdae4baedda20a7f17bd47450b (diff) | |
| download | openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.gz openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.bz2 openshift-7374505de2a11b94d22672b8da7e405b919a15bc.tar.xz openshift-7374505de2a11b94d22672b8da7e405b919a15bc.zip | |
Merge pull request #2964 from mtnbikenc/linting-refactor
YAML Linting with CI checking
Diffstat (limited to 'playbooks/common/openshift-master')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/restart.yml | 13 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/restart_hosts.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/restart_services.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/service.yml | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 5fcb850a2..b9716cafe 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -99,8 +99,8 @@ - openshift_facts: role: master local_facts: - session_auth_secrets: "{{ openshift_master_session_auth_secrets | default(openshift.master.session_auth_secrets | default(None)) }}" - session_encryption_secrets: "{{ openshift_master_session_encryption_secrets | default(openshift.master.session_encryption_secrets | default(None)) }}" + session_auth_secrets: "{{ openshift_master_session_auth_secrets | default(openshift.master.session_auth_secrets | default(None)) }}" + session_encryption_secrets: "{{ openshift_master_session_encryption_secrets | default(openshift.master.session_encryption_secrets | default(None)) }}" - name: Generate master session secrets hosts: oo_first_master diff --git a/playbooks/common/openshift-master/restart.yml b/playbooks/common/openshift-master/restart.yml index 5769ef5cd..7b340887a 100644 --- a/playbooks/common/openshift-master/restart.yml +++ b/playbooks/common/openshift-master/restart.yml @@ -13,12 +13,12 @@ role: "{{ item.role }}" local_facts: "{{ item.local_facts }}" with_items: - - role: common - local_facts: - rolling_restart_mode: "{{ openshift_rolling_restart_mode | default('services') }}" - - role: master - local_facts: - cluster_method: "{{ openshift_master_cluster_method | default(None) }}" + - role: common + local_facts: + rolling_restart_mode: "{{ openshift_rolling_restart_mode | default('services') }}" + - role: master + local_facts: + cluster_method: "{{ openshift_master_cluster_method | default(None) }}" # Creating a temp file on localhost, we then check each system that will # be rebooted to see if that file exists, if so we know we're running @@ -76,4 +76,3 @@ when: openshift.common.rolling_restart_mode == 'system' - include: restart_services.yml when: openshift.common.rolling_restart_mode == 'services' - diff --git a/playbooks/common/openshift-master/restart_hosts.yml b/playbooks/common/openshift-master/restart_hosts.yml index 4e48f94d1..ffa23d26a 100644 --- a/playbooks/common/openshift-master/restart_hosts.yml +++ b/playbooks/common/openshift-master/restart_hosts.yml @@ -1,3 +1,4 @@ +--- - name: Restart master system # https://github.com/ansible/ansible/issues/10616 shell: sleep 2 && shutdown -r now "OpenShift Ansible master rolling restart" diff --git a/playbooks/common/openshift-master/restart_services.yml b/playbooks/common/openshift-master/restart_services.yml index a5ab62dc5..25fa10450 100644 --- a/playbooks/common/openshift-master/restart_services.yml +++ b/playbooks/common/openshift-master/restart_services.yml @@ -1,3 +1,4 @@ +--- - name: Restart master service: name: "{{ openshift.common.service_type }}-master" diff --git a/playbooks/common/openshift-master/service.yml b/playbooks/common/openshift-master/service.yml index 5e5198335..43ef8b6a1 100644 --- a/playbooks/common/openshift-master/service.yml +++ b/playbooks/common/openshift-master/service.yml @@ -17,4 +17,4 @@ connection: ssh gather_facts: no tasks: - - service: name={{ openshift.common.service_type }}-master state="{{ new_cluster_state }}" + - service: name={{ openshift.common.service_type }}-master state="{{ new_cluster_state }}" |