diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-02 10:35:07 +0000 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2015-03-02 10:35:07 +0000 |
commit | 994bb1b297929e92a17c72fa73c637fd97fd6845 (patch) | |
tree | a39fb36d870d80fb8e093746b5415cdd3fadec77 | |
parent | ee19a981b4d499f61f14a3b9890a7c1b2ed4a548 (diff) | |
download | definitions-994bb1b297929e92a17c72fa73c637fd97fd6845.tar.gz |
load swift vars from swift-vars.yml and reaname swift_pass
-rw-r--r-- | openstack/usr/share/openstack/swift-controller.yml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/openstack/usr/share/openstack/swift-controller.yml b/openstack/usr/share/openstack/swift-controller.yml index f1d237ec..b3f5b03b 100644 --- a/openstack/usr/share/openstack/swift-controller.yml +++ b/openstack/usr/share/openstack/swift-controller.yml @@ -1,11 +1,7 @@ --- - hosts: devstack - vars: - swift_pass: insecure - KEYSTONE_TEMPORARY_ADMIN_TOKEN: a682f596-76f3-11e3-b3b2-e716f9080d50 - SWIFT_ADMIN_URL: http://127.0.0.1:8080 - SWIFT_INTERNAL_URL: http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s - SWIFT_PUBLIC_URL: http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s + vars_files: + - swift-vars.yml remote_user: root tasks: - user: name=swift comment="Swift user" @@ -13,7 +9,7 @@ - keystone_user: > user=swift - password={{ swift_pass }} + password={{ SWIFT_ADMIN_PASSWORD }} tenant=service token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} |