Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ASB user and password defaults #9384

Merged
merged 1 commit into from Aug 2, 2018
Merged

Fix ASB user and password defaults #9384

merged 1 commit into from Aug 2, 2018

Conversation

jmontleon
Copy link
Contributor

@fabianvf @sdodson This should be the python null, None. Not the ansible null, null.

The task then passes successfully:

TASK [ansible_service_broker : Set default image variables based on deployment type] ******************************************************************************************************************************
task path: /usr/share/ansible/openshift-ansible/roles/ansible_service_broker/tasks/facts.yml:3
ok: [192.168.121.126.nip.io] => (item=/usr/share/ansible/openshift-ansible/roles/ansible_service_broker/vars/openshift-enterprise.yml) => {
    "ansible_facts": {
        "__ansible_service_broker_registry_name": "rh", 
        "__ansible_service_broker_registry_organization": null, 
        "__ansible_service_broker_registry_password": "{{ oreg_auth_password | default(None) }}", 
        "__ansible_service_broker_registry_tag": "{{ openshift_image_tag }}", 
        "__ansible_service_broker_registry_type": "rhcc", 
        "__ansible_service_broker_registry_url": "https://registry.redhat.io", 
        "__ansible_service_broker_registry_user": "{{ oreg_auth_user | default(None) }}", 
        "__ansible_service_broker_registry_whitelist": [
            ".*-apb$"
        ]
    }, 
    "ansible_included_var_files": [
        "/usr/share/ansible/openshift-ansible/roles/ansible_service_broker/vars/openshift-enterprise.yml"
    ], 
    "changed": false, 
    "item": "/usr/share/ansible/openshift-ansible/roles/ansible_service_broker/vars/openshift-enterprise.yml"
}

TASK [ansible_service_broker : set ansible_service_broker facts] **************************************************************************************************************************************************
task path: /usr/share/ansible/openshift-ansible/roles/ansible_service_broker/tasks/facts.yml:9
ok: [192.168.121.126.nip.io] => {
    "ansible_facts": {
        "ansible_service_broker_registry_name": "dh", 
        "ansible_service_broker_registry_organization": "", 
        "ansible_service_broker_registry_password": "", 
        "ansible_service_broker_registry_tag": "v3.11.0", 
        "ansible_service_broker_registry_type": "rhcc", 
        "ansible_service_broker_registry_url": "http://asb-registry.usersys.redhat.com:5000", 
        "ansible_service_broker_registry_user": "", 
        "ansible_service_broker_registry_whitelist": [
            ".*-apb$"
        ]
    }, 
    "changed": false
}

@openshift-ci-robot openshift-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Aug 1, 2018
@sdodson
Copy link
Member

sdodson commented Aug 1, 2018

/cc @fabianvf

@fabianvf
Copy link
Member

fabianvf commented Aug 1, 2018

Oops
/approve

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 1, 2018
@sdodson
Copy link
Member

sdodson commented Aug 1, 2018

/lgtm

@sdodson
Copy link
Member

sdodson commented Aug 1, 2018

This was changed recently on master branch here, https://github.com/jmontleon/openshift-ansible/commit/0820b071503d2a045b59177fe70ba7a0d2035396
I'm not sure if this is a problem prior to that commit or not? What do you think @fabianvf

@fabianvf
Copy link
Member

fabianvf commented Aug 1, 2018

@sdodson I don't think so, I think the error arises from using null in the jinja block, when it's just in the yaml it's properly interpreted.

@jmontleon
Copy link
Contributor Author

That's my understanding as well.

@sdodson
Copy link
Member

sdodson commented Aug 2, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 2, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabianvf, jmontleon, sdodson

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 56cf05a into openshift:master Aug 2, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants