diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-12-08 09:52:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 09:52:15 -0500 |
| commit | 0f98871d0f4cf39eded2fcd6041fcea4f83bbed6 (patch) | |
| tree | dd4269d8cd6d4f8beb4becea8a883716e6081f13 /playbooks/openshift-etcd | |
| parent | 2af8419bab887c8552337333023ce357b1a18bc0 (diff) | |
| parent | eb6b20fc9183cc2aae424c72efd1191b99110a93 (diff) | |
| download | openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.gz openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.bz2 openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.tar.xz openshift-0f98871d0f4cf39eded2fcd6041fcea4f83bbed6.zip | |
Merge pull request #6278 from mgugino-upstream-stage/service_type
Remove openshift.common.service_type
Diffstat (limited to 'playbooks/openshift-etcd')
| -rw-r--r-- | playbooks/openshift-etcd/private/embedded2external.yml | 2 | ||||
| -rw-r--r-- | playbooks/openshift-etcd/private/migrate.yml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/playbooks/openshift-etcd/private/embedded2external.yml b/playbooks/openshift-etcd/private/embedded2external.yml index c7a532622..be177b714 100644 --- a/playbooks/openshift-etcd/private/embedded2external.yml +++ b/playbooks/openshift-etcd/private/embedded2external.yml @@ -22,7 +22,7 @@ name: openshift_master tasks_from: check_master_api_is_ready.yml - set_fact: - master_service: "{{ openshift.common.service_type + '-master' }}" + master_service: "{{ openshift_service_type + '-master' }}" embedded_etcd_backup_suffix: "{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}" - debug: msg: "master service name: {{ master_service }}" diff --git a/playbooks/openshift-etcd/private/migrate.yml b/playbooks/openshift-etcd/private/migrate.yml index 834bd242d..9ddb4afe2 100644 --- a/playbooks/openshift-etcd/private/migrate.yml +++ b/playbooks/openshift-etcd/private/migrate.yml @@ -28,8 +28,8 @@ tasks: - set_fact: master_services: - - "{{ openshift.common.service_type + '-master-controllers' }}" - - "{{ openshift.common.service_type + '-master-api' }}" + - "{{ openshift_service_type + '-master-controllers' }}" + - "{{ openshift_service_type + '-master-api' }}" - debug: msg: "master service name: {{ master_services }}" - name: Stop masters |