diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-11 20:35:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 20:35:55 -0500 |
| commit | f5f182afeed284f893fb414513b7e50a050754e7 (patch) | |
| tree | 66d48c1254b5788b3c6c7cf1b16643ad5f29df36 /playbooks | |
| parent | 97cf14a03d2b392e2355478c74882d7be9f653d2 (diff) | |
| parent | 4cf4cd702d9dddb26100df0a121ba8bc2de829be (diff) | |
| download | openshift-f5f182afeed284f893fb414513b7e50a050754e7.tar.gz openshift-f5f182afeed284f893fb414513b7e50a050754e7.tar.bz2 openshift-f5f182afeed284f893fb414513b7e50a050754e7.tar.xz openshift-f5f182afeed284f893fb414513b7e50a050754e7.zip | |
Merge pull request #3899 from mtnbikenc/fix-common-refs
Merged by openshift-bot
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/ca.yml | 6 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/restart.yml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml index cbb4a2434..3b26abcc7 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/ca.yml @@ -130,7 +130,7 @@ state: absent changed_when: false -- include: ../../../common/openshift-etcd/restart.yml +- include: ../openshift-etcd/restart.yml # Update master config when ca-bundle not referenced. Services will be # restarted below after new CA certificate has been distributed. @@ -322,7 +322,7 @@ group: "{{ 'root' if item == 'root' else _ansible_ssh_user_gid.stdout }}" with_items: "{{ client_users }}" -- include: ../../../common/openshift-master/restart.yml +- include: ../openshift-master/restart.yml - name: Distribute OpenShift CA certificate to nodes hosts: oo_nodes_to_config @@ -371,4 +371,4 @@ state: absent changed_when: false -- include: ../../../common/openshift-node/restart.yml +- include: ../openshift-node/restart.yml diff --git a/playbooks/common/openshift-master/restart.yml b/playbooks/common/openshift-master/restart.yml index b35368bf1..6fec346c3 100644 --- a/playbooks/common/openshift-master/restart.yml +++ b/playbooks/common/openshift-master/restart.yml @@ -1,5 +1,5 @@ --- -- include: ../../common/openshift-master/validate_restart.yml +- include: validate_restart.yml - name: Restart masters hosts: oo_masters_to_config @@ -12,8 +12,8 @@ roles: - openshift_facts post_tasks: - - include: ../../common/openshift-master/restart_hosts.yml + - include: restart_hosts.yml when: openshift_rolling_restart_mode | default('services') == 'system' - - include: ../../common/openshift-master/restart_services.yml + - include: restart_services.yml when: openshift_rolling_restart_mode | default('services') == 'services' |