Fix keystone endpoint creation for Swift

* Setup the keystone endpoint for swift
* Move swift-proxy port to 8888 (8000 is used by heat)
* Typo prevented object server services from restarting
* Adjust order of swift plays for swift-all.yml

rpc_deployment/inventory/group_vars/swift_all.yml

@@ -41,7 +41,7 @@ container_lvm_fssize: 5GB
 #     driver: cinder.volume.drivers.lvm.LVMISCSIDriver
 #     backend_name: LVM_iSCSI
 
-swift_proxy_port: "8000"
+swift_proxy_port: "8888"
 swift_object_port: "6000"
 swift_container_port: "6001"
 swift_account_port: "6002"

rpc_deployment/playbooks/openstack/keystone-add-all-services.yml

@@ -111,3 +111,12 @@
   vars_files:
     - inventory/group_vars/nova_all.yml
     - vars/openstack_service_vars/nova_api_s3_endpoint.yml
+
+# Swift endpoint
+- hosts: keystone[0]
+  user: root
+  roles:
+    - keystone_add_service
+  vars_files:
+    - inventory/group_vars/swift_all.yml
+    - vars/openstack_service_vars/swift_proxy_endpoint.yml

rpc_deployment/playbooks/openstack/swift-all.yml

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- include: swift-build-rings.yml
 - include: swift-proxy.yml
 - include: swift-storage.yml
-- include: swift-build-rings.yml

rpc_deployment/playbooks/openstack/swift-build-rings.yml

@@ -4,6 +4,7 @@
   roles:
     - { role: container_common, tags: [ 'directories' ] }
     - openstack_common
+    - swift_common
     - swift_ring_builder
   vars_files:
     - inventory/group_vars/swift_all.yml

rpc_deployment/roles/swift_account/tasks/main.yml

@@ -13,7 +13,7 @@
 
 - name: "Set account server to start at boot"
   cron: >
-    name="Restart account-sever on boot"
+    name="Restart account-server on boot"
     special_time=reboot
     job="swift-init account-server start"
 

rpc_deployment/roles/swift_object/handlers/main.yml

@@ -8,5 +8,5 @@
 - name: Restart object replicator
   command: swift-init object-replicator restart
 
-- name: Retart object updater
+- name: Restart object updater
   command: swift-init object-updater restart

rpc_deployment/vars/config_vars/haproxy_config.yml

@@ -181,7 +181,7 @@ haproxy_config:
   - service:
       hap_service_name: swift_proxy
       hap_backend_nodes: "{{ groups['swift_proxy'] }}"
-      hap_port: 8000
+      hap_port: 8888
       hap_balance_type: http
       hap_backend_alg: source
       hap_backend_options:

rpc_deployment/vars/openstack_service_vars/swift_proxy_endpoint.yml

@@ -0,0 +1,22 @@
+---
+# Copyright 2014, Rackspace US, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+service_type: object-store
+service_description: "Object Storage Service"
+service_password: "{{ swift_service_password }}"
+
+service_publicurl: "http://{{ external_vip_address }}:{{ swift_proxy_port }}/v1/AUTH_%(tenant_id)s"
+service_adminurl: "http://{{ internal_vip_address }}:{{ swift_proxy_port }}/v1/AUTH_%(tenant_id)s"
+service_internalurl: "http://{{ internal_vip_address }}:{{ swift_proxy_port }}/v1/AUTH_%(tenant_id)s"

scripts/uklabsetup.sh

@@ -32,5 +32,7 @@ pushd /root/ansible-lxc-rpc
 
       # Openstack Service Setup
       ansible-playbook -e @/etc/rpc_deploy/user_variables.yml playbooks/openstack/openstack-setup.yml
+
+      ansible-playbook -e @/etc/rpc_deploy/user_variables.yml playbooks/openstack/swift-all.yml
     popd
 popd