openstack/kolla-ansible
Code Issues Proposed changes

Merge "Reconfigure for Swift"

Browse Source
This commit is contained in:
Jenkins 2016-03-06 15:19:11 +00:00 committed by Gerrit Code Review
commit 1e70714197
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ansible/roles/swift/tasks/do_reconfigure.yml
View File

@ -11,17 +11,19 @@
- { name: swift_account_auditor, group: swift-account-server } - { name: swift_account_auditor, group: swift-account-server }
- { name: swift_account_replicator, group: swift-account-server } - { name: swift_account_replicator, group: swift-account-server }
- { name: swift_account_reaper, group: swift-account-server } - { name: swift_account_reaper, group: swift-account-server }
- { name: swift_rsyncd, group: swift-account-server }
- { name: swift_container_server, group: swift-container-server } - { name: swift_container_server, group: swift-container-server }
- { name: swift_container_auditor, group: swift-container-server } - { name: swift_container_auditor, group: swift-container-server }
- { name: swift_container_replicator, group: swift-container-server } - { name: swift_container_replicator, group: swift-container-server }
- { name: swift_container_updater, group: swift-container-server } - { name: swift_container_updater, group: swift-container-server }
- { name: swift_rsyncd, group: swift-container-server }
- { name: swift_object_server, group: swift-object-server } - { name: swift_object_server, group: swift-object-server }
- { name: swift_object_auditor, group: swift-object-server } - { name: swift_object_auditor, group: swift-object-server }
- { name: swift_object_replicator, group: swift-object-server } - { name: swift_object_replicator, group: swift-object-server }
- { name: swift_object_updater, group: swift-object-server } - { name: swift_object_updater, group: swift-object-server }
- { name: swift_object_expirer, group: swift-object-server } - { name: swift_object_expirer, group: swift-object-server }
- { name: swift_rsyncd, group: swift-object-server }
- { name: swift_proxy_server, group: swift-proxy-server } - { name: swift_proxy_server, group: swift-proxy-server }
- { name: swift_rsyncd, group: swift-proxy-server }
- include: config.yml - include: config.yml
@ -36,17 +38,19 @@
- { name: swift_account_auditor, group: swift-account-server } - { name: swift_account_auditor, group: swift-account-server }
- { name: swift_account_replicator, group: swift-account-server } - { name: swift_account_replicator, group: swift-account-server }
- { name: swift_account_reaper, group: swift-account-server } - { name: swift_account_reaper, group: swift-account-server }
- { name: swift_rsyncd, group: swift-account-server }
- { name: swift_container_server, group: swift-container-server } - { name: swift_container_server, group: swift-container-server }
- { name: swift_container_auditor, group: swift-container-server } - { name: swift_container_auditor, group: swift-container-server }
- { name: swift_container_replicator, group: swift-container-server } - { name: swift_container_replicator, group: swift-container-server }
- { name: swift_container_updater, group: swift-container-server } - { name: swift_container_updater, group: swift-container-server }
- { name: swift_rsyncd, group: swift-container-server }
- { name: swift_object_server, group: swift-object-server } - { name: swift_object_server, group: swift-object-server }
- { name: swift_object_auditor, group: swift-object-server } - { name: swift_object_auditor, group: swift-object-server }
- { name: swift_object_replicator, group: swift-object-server } - { name: swift_object_replicator, group: swift-object-server }
- { name: swift_object_updater, group: swift-object-server } - { name: swift_object_updater, group: swift-object-server }
- { name: swift_object_expirer, group: swift-object-server } - { name: swift_object_expirer, group: swift-object-server }
- { name: swift_rsyncd, group: swift-object-server }
- { name: swift_proxy_server, group: swift-proxy-server } - { name: swift_proxy_server, group: swift-proxy-server }
- { name: swift_rsyncd, group: swift-proxy-server }
# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS' # NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE', # and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
@ -62,17 +66,19 @@
- { name: swift_account_auditor, group: swift-account-server } - { name: swift_account_auditor, group: swift-account-server }
- { name: swift_account_replicator, group: swift-account-server } - { name: swift_account_replicator, group: swift-account-server }
- { name: swift_account_reaper, group: swift-account-server } - { name: swift_account_reaper, group: swift-account-server }
- { name: swift_rsyncd, group: swift-account-server }
- { name: swift_container_server, group: swift-container-server } - { name: swift_container_server, group: swift-container-server }
- { name: swift_container_auditor, group: swift-container-server } - { name: swift_container_auditor, group: swift-container-server }
- { name: swift_container_replicator, group: swift-container-server } - { name: swift_container_replicator, group: swift-container-server }
- { name: swift_container_updater, group: swift-container-server } - { name: swift_container_updater, group: swift-container-server }
- { name: swift_rsyncd, group: swift-container-server }
- { name: swift_object_server, group: swift-object-server } - { name: swift_object_server, group: swift-object-server }
- { name: swift_object_auditor, group: swift-object-server } - { name: swift_object_auditor, group: swift-object-server }
- { name: swift_object_replicator, group: swift-object-server } - { name: swift_object_replicator, group: swift-object-server }
- { name: swift_object_updater, group: swift-object-server } - { name: swift_object_updater, group: swift-object-server }
- { name: swift_object_expirer, group: swift-object-server } - { name: swift_object_expirer, group: swift-object-server }
- { name: swift_rsyncd, group: swift-object-server }
- { name: swift_proxy_server, group: swift-proxy-server } - { name: swift_proxy_server, group: swift-proxy-server }
- { name: swift_rsyncd, group: swift-proxy-server }
- name: Remove the containers - name: Remove the containers
kolla_docker: kolla_docker:
@ -88,17 +94,19 @@
{ name: swift_account_auditor, group: swift-account-server }, { name: swift_account_auditor, group: swift-account-server },
{ name: swift_account_replicator, group: swift-account-server }, { name: swift_account_replicator, group: swift-account-server },
{ name: swift_account_reaper, group: swift-account-server }, { name: swift_account_reaper, group: swift-account-server },
{ name: swift_rsyncd, group: swift-account-server },
{ name: swift_container_server, group: swift-container-server }, { name: swift_container_server, group: swift-container-server },
{ name: swift_container_auditor, group: swift-container-server }, { name: swift_container_auditor, group: swift-container-server },
{ name: swift_container_replicator, group: swift-container-server }, { name: swift_container_replicator, group: swift-container-server },
{ name: swift_container_updater, group: swift-container-server }, { name: swift_container_updater, group: swift-container-server },
{ name: swift_rsyncd, group: swift-container-server },
{ name: swift_object_server, group: swift-object-server }, { name: swift_object_server, group: swift-object-server },
{ name: swift_object_auditor, group: swift-object-server }, { name: swift_object_auditor, group: swift-object-server },
{ name: swift_object_replicator, group: swift-object-server }, { name: swift_object_replicator, group: swift-object-server },
{ name: swift_object_updater, group: swift-object-server }, { name: swift_object_updater, group: swift-object-server },
{ name: swift_object_expirer, group: swift-object-server }, { name: swift_object_expirer, group: swift-object-server },
{ name: swift_proxy_server, group: swift-proxy-server }, { name: swift_rsyncd, group: swift-object-server },
{ name: swift_rsyncd, group: swift-proxy-server }] { name: swift_proxy_server, group: swift-proxy-server }]
- container_envs.results - container_envs.results
- check_results.results - check_results.results
@ -119,16 +127,18 @@
{ name: swift_account_auditor, group: swift-account-server }, { name: swift_account_auditor, group: swift-account-server },
{ name: swift_account_replicator, group: swift-account-server }, { name: swift_account_replicator, group: swift-account-server },
{ name: swift_account_reaper, group: swift-account-server }, { name: swift_account_reaper, group: swift-account-server },
{ name: swift_rsyncd, group: swift-account-server },
{ name: swift_container_server, group: swift-container-server }, { name: swift_container_server, group: swift-container-server },
{ name: swift_container_auditor, group: swift-container-server }, { name: swift_container_auditor, group: swift-container-server },
{ name: swift_container_replicator, group: swift-container-server }, { name: swift_container_replicator, group: swift-container-server },
{ name: swift_container_updater, group: swift-container-server }, { name: swift_container_updater, group: swift-container-server },
{ name: swift_rsyncd, group: swift-container-server },
{ name: swift_object_server, group: swift-object-server }, { name: swift_object_server, group: swift-object-server },
{ name: swift_object_auditor, group: swift-object-server }, { name: swift_object_auditor, group: swift-object-server },
{ name: swift_object_replicator, group: swift-object-server }, { name: swift_object_replicator, group: swift-object-server },
{ name: swift_object_updater, group: swift-object-server }, { name: swift_object_updater, group: swift-object-server },
{ name: swift_object_expirer, group: swift-object-server }, { name: swift_object_expirer, group: swift-object-server },
{ name: swift_proxy_server, group: swift-proxy-server }, { name: swift_rsyncd, group: swift-object-server },
{ name: swift_rsyncd, group: swift-proxy-server }] { name: swift_proxy_server, group: swift-proxy-server }]
- container_envs.results - container_envs.results
- check_results.results - check_results.results

4
ansible/roles/swift/tasks/start.yml
View File

@ -41,7 +41,9 @@
- "{{ node_config_directory }}/swift-rsyncd/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/swift-rsyncd/:{{ container_config_directory }}/:ro"
- "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}" - "{{ swift_devices_mount_point }}:{{ swift_devices_mount_point }}"
- "heka_socket:/var/lib/kolla/heka/" - "heka_socket:/var/lib/kolla/heka/"
when: inventory_hostname not in groups['swift-proxy-server'] when: inventory_hostname in groups['swift-account-server'] or
inventory_hostname in groups['swift-container-server'] or
inventory_hostname in groups['swift-object-server']
- name: Starting swift-account-server container - name: Starting swift-account-server container
kolla_docker: kolla_docker: