diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-12-27 17:44:34 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2017-01-05 09:42:35 +0800 |
| commit | 92f6ca7bb6d7b2f295406aab34094b1dba76ff94 (patch) | |
| tree | c4e62927a3bf9862f7ba9ce286cbece2c4335ef4 /deploy/adapters/ansible/roles/moon/vars | |
| parent | 6072a49adb33f2bce3f48b9c7b8be7d96cf8501c (diff) | |
Yamllint test
JIRA: COMPASS-516
Change-Id: I482ce9bc86f4f963258c5b8823e0b00e83556eef
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'deploy/adapters/ansible/roles/moon/vars')
| -rw-r--r-- | deploy/adapters/ansible/roles/moon/vars/main.yml | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/deploy/adapters/ansible/roles/moon/vars/main.yml b/deploy/adapters/ansible/roles/moon/vars/main.yml index cff8c7c2..6793c189 100644 --- a/deploy/adapters/ansible/roles/moon/vars/main.yml +++ b/deploy/adapters/ansible/roles/moon/vars/main.yml @@ -60,22 +60,6 @@ os_services: internalurl: "http://{{ internal_vip.ip }}:8042" adminurl: "http://{{ internal_vip.ip }}:8042" -# - name: cinder -# type: volume -# region: RegionOne -# description: "OpenStack Block Storage" -# publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" -# internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" -# adminurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" -# -# - name: cinderv2 -# type: volumev2 -# region: RegionOne -# description: "OpenStack Block Storage v2" -# publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" -# internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" -# adminurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" - - name: heat type: orchestration region: RegionOne @@ -92,6 +76,22 @@ os_services: internalurl: "http://{{ internal_vip.ip }}:8000/v1" adminurl: "http://{{ internal_vip.ip }}:8000/v1" +# - name: cinder +# type: volume +# region: RegionOne +# description: "OpenStack Block Storage" +# publicurl: "http://{{ public_vip.ip }}:8776/v1/%(tenant_id)s" +# internalurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" +# adminurl: "http://{{ internal_vip.ip }}:8776/v1/%(tenant_id)s" + +# - name: cinderv2 +# type: volumev2 +# region: RegionOne +# description: "OpenStack Block Storage v2" +# publicurl: "http://{{ public_vip.ip }}:8776/v2/%(tenant_id)s" +# internalurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" +# adminurl: "http://{{ internal_vip.ip }}:8776/v2/%(tenant_id)s" + # - name: swift # type: object-store # region: RegionOne @@ -163,10 +163,3 @@ os_users: role: heat_stack_user tenant: demo tenant_description: "Demo Tenant" - -# - user: swift -# password: "{{ CINDER_PASS }}" -# email: swift@admin.com -# role: admin -# tenant: service -# tenant_description: "Service Tenant" |