diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-08-25 14:42:40 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-08-25 14:42:40 -0400 |
| commit | 791640e083c31e4380a3d7cd929fd67567a944f8 (patch) | |
| tree | d2cf08fbf7a3bca2e5fd35378f40f6758b87f579 /roles/openshift_cloud_provider/tasks | |
| parent | b8e72ea2143834317043f19cbc3dddf8ad9047a5 (diff) | |
| download | openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.gz openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.bz2 openshift-791640e083c31e4380a3d7cd929fd67567a944f8.tar.xz openshift-791640e083c31e4380a3d7cd929fd67567a944f8.zip | |
Don't use openshift_env for cloud provider facts.
Diffstat (limited to 'roles/openshift_cloud_provider/tasks')
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 10 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/openstack.yml | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml index 6111d1207..46549fc75 100644 --- a/roles/openshift_cloud_provider/tasks/main.yml +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -1,14 +1,4 @@ --- -- name: Set cloud provider facts - openshift_facts: - role: cloudprovider - openshift_env: "{{ hostvars - | oo_merge_hostvars(vars, inventory_hostname) - | oo_openshift_env }}" - openshift_env_structures: - - 'openshift.cloudprovider.aws.*' - - 'openshift.cloudprovider.openstack.*' - - name: Create cloudprovider config dir file: path: "{{ openshift.common.config_base }}/cloudprovider" diff --git a/roles/openshift_cloud_provider/tasks/openstack.yml b/roles/openshift_cloud_provider/tasks/openstack.yml index c501121e5..f22dd4520 100644 --- a/roles/openshift_cloud_provider/tasks/openstack.yml +++ b/roles/openshift_cloud_provider/tasks/openstack.yml @@ -7,4 +7,4 @@ template: dest: "{{ openshift.common.config_base }}/cloudprovider/openstack.conf" src: openstack.conf.j2 - when: "'auth_url' in openshift.cloudprovider.openstack and 'username' in openshift.cloudprovider.openstack and 'password' in openshift.cloudprovider.openstack and ('tenant_id' in openshift.cloudprovider.openstack or 'tenant_name' in openshift.cloudprovider.openstack)" + when: "openshift_cloudprovider_openstack_auth_url is defined and openshift_cloudprovider_openstack_username is defined and openshift_cloudprovider_openstack_password is defined and (openshift_cloudprovider_openstack_tenant_id is defined or openshift_cloudprovider_openstack_tenant_name is defined)" |