diff options
| author |   QiLiang <liangqi1@huawei.com> | 2016-09-09 19:53:19 +0800 |
|---|---|---|
| committer | QiLiang <liangqi1@huawei.com> | 2016-09-09 19:56:09 +0800 |
| commit | aaac2cd21e3b096c077b8d80947ad3df2f81717b (patch) | |
| tree | fde51953de0587cd9da9df5b4860bd7d4e37af11 /deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone | |
| parent | dcd9f8eadb84793ac294b8a1c7689423fa4a330d (diff) | |
Temporally disable swift support in moon scenario
Change-Id: Ib7ff639026e6975ca01359a76a57274f1fd8537b
Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone')
| -rw-r--r-- | deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml index 9ce499da..ac548a09 100644 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml +++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/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 @@ -171,9 +171,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" |