From 9043bc765b02bb52880ac98e15d7f54025b6f060 Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sun, 1 Mar 2015 16:40:00 +0000 Subject: swift.yml -> swift-controller.yml --- openstack/manifest | 2 +- openstack/usr/share/openstack/swift-controller.yml | 32 ++++++++++++++++++++++ openstack/usr/share/openstack/swift.yml | 32 ---------------------- 3 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 openstack/usr/share/openstack/swift-controller.yml delete mode 100644 openstack/usr/share/openstack/swift.yml diff --git a/openstack/manifest b/openstack/manifest index 7a463e0c..d929a5b9 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -164,7 +164,7 @@ 0040755 0 0 /etc/swift 0100644 0 0 /etc/swift/proxy-server.conf 0100644 0 0 /etc/swift/swift.conf -0100644 0 0 /usr/share/openstack/swift.yml +0100644 0 0 /usr/share/openstack/swift-controller.yml 0100644 0 0 /etc/swift/account-server.conf 0100644 0 0 /etc/swift/container-server.conf 0100644 0 0 /etc/swift/object-server.conf diff --git a/openstack/usr/share/openstack/swift-controller.yml b/openstack/usr/share/openstack/swift-controller.yml new file mode 100644 index 00000000..dbc250e8 --- /dev/null +++ b/openstack/usr/share/openstack/swift-controller.yml @@ -0,0 +1,32 @@ +--- +- 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 + remote_user: richardipsum + tasks: + - keystone_user: > + user=swift + password={{ swift_pass }} + tenant=service + token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} + + - keystone_user: > + role=admin + user=swift + tenant=service + token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} + + - keystone_service: > + name=swift + type=object-store + description="OpenStack Object Storage" + publicurl={{ SWIFT_PUBLIC_URL }} + internalurl={{ SWIFT_INTERNAL_URL + | default('http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s') }} + adminurl={{ SWIFT_ADMIN_URL }} + region='RegionOne' + token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} diff --git a/openstack/usr/share/openstack/swift.yml b/openstack/usr/share/openstack/swift.yml deleted file mode 100644 index dbc250e8..00000000 --- a/openstack/usr/share/openstack/swift.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- 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 - remote_user: richardipsum - tasks: - - keystone_user: > - user=swift - password={{ swift_pass }} - tenant=service - token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} - - - keystone_user: > - role=admin - user=swift - tenant=service - token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} - - - keystone_service: > - name=swift - type=object-store - description="OpenStack Object Storage" - publicurl={{ SWIFT_PUBLIC_URL }} - internalurl={{ SWIFT_INTERNAL_URL - | default('http://127.0.0.1:8080/v1/AUTH_%(tenant_id)s') }} - adminurl={{ SWIFT_ADMIN_URL }} - region='RegionOne' - token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} -- cgit v1.2.1