diff options
author | Scott Dodson <sdodson@redhat.com> | 2016-07-21 13:11:59 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-21 13:11:59 -0400 |
commit | 4507beb2d4f4709583b3cba3eec7c5b57163e9bc (patch) | |
tree | 9e4f7229780e7a19329d631bf729f971225057de /roles/openshift_master | |
parent | 19b6794f877e723c0828e6e592dfaa99f0207d18 (diff) | |
parent | 4ec879a68e7d50f7848364c8cb5b55e82694ef00 (diff) | |
download | openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.tar.gz openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.tar.bz2 openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.tar.xz openshift-4507beb2d4f4709583b3cba3eec7c5b57163e9bc.zip |
Merge pull request #1990 from abutcher/openshift-certificates
Refactor openshift certificates roles.
Diffstat (limited to 'roles/openshift_master')
-rw-r--r-- | roles/openshift_master/meta/main.yml | 5 | ||||
-rw-r--r-- | roles/openshift_master/tasks/main.yml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_master/meta/main.yml b/roles/openshift_master/meta/main.yml index 0a69b3eef..be70d9102 100644 --- a/roles/openshift_master/meta/main.yml +++ b/roles/openshift_master/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: description: Master company: Red Hat, Inc. license: Apache License, Version 2.0 - min_ansible_version: 1.7 + min_ansible_version: 2.1 platforms: - name: EL versions: @@ -13,8 +13,7 @@ galaxy_info: - cloud dependencies: - role: openshift_clock -- role: openshift_docker -- role: openshift_cli +- role: openshift_master_certificates - role: openshift_cloud_provider - role: openshift_builddefaults - role: openshift_master_facts diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 5c6c64018..0b87ae48c 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -212,6 +212,7 @@ until: api_available_output.stdout == 'ok' retries: 120 delay: 1 + run_once: true changed_when: false when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' and master_api_service_status_changed | bool |