diff options
| author |   Justin chi <chigang@huawei.com> | 2016-09-19 15:28:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-19 15:28:20 +0000 |
| commit | 185067089ab0755ea4973de5454260d2557b7373 (patch) | |
| tree | d58a15719549a76864c8febd672c6a854676205b /deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml | |
| parent | 2171504a5331409c11935adf977a11c77e583f51 (diff) | |
| parent | 297be8f88ecae18e417cddb37b7ef3fe263fd12e (diff) | |
Merge "Temporally disable swift support in moon scenario" into stable/colorado
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml index aad55d05..cff8c7c2 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml @@ -92,13 +92,13 @@ os_services: internalurl: "http://{{ internal_vip.ip }}:8000/v1" adminurl: "http://{{ internal_vip.ip }}:8000/v1" - - name: swift - type: object-store - region: RegionOne - description: "OpenStack Object Storage" - publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" - internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" - adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" +# - name: swift +# type: object-store +# region: RegionOne +# description: "OpenStack Object Storage" +# publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" +# internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" +# adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s" os_users: - user: admin @@ -164,9 +164,9 @@ os_users: tenant: demo tenant_description: "Demo Tenant" - - user: swift - password: "{{ CINDER_PASS }}" - email: swift@admin.com - role: admin - tenant: service - tenant_description: "Service Tenant" +# - user: swift +# password: "{{ CINDER_PASS }}" +# email: swift@admin.com +# role: admin +# tenant: service +# tenant_description: "Service Tenant" |