Temporally disable swift support in moon scenario

Change-Id: Ib7ff639026e6975ca01359a76a57274f1fd8537b
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit aaac2cd21e3b096c077b8d80947ad3df2f81717b)

6 files changed, 46 insertions, 47 deletions

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
index c6b1c9ab..ec4c53f4 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/HA-ansible-multinodes.yml
@@ -99,7 +99,6 @@
   accelerate: true
   max_fail_percentage: 0
   roles:
-    - swift
     - moon
 
 - hosts: all
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
index 66ea7139..c0a0747d 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ha/templates/haproxy.cfg
@@ -158,15 +158,15 @@ listen  proxy-cinder_api_cluster
     server {{ host }} {{ ip }}:8776 weight 1 check inter 2000 rise 2 fall 5
 {% endfor %}
 
-listen  proxy-swift-proxy
-    bind {{ internal_vip.ip }}:8080
-    bind {{ public_vip.ip }}:8080
-    balance  source
-    option  tcpka
-    option  tcplog
-{% for host,ip in haproxy_hosts.items() %}
-    server {{ host }} {{ ip }}:8080 weight 1 check inter 2000 rise 2 fall 5
-{% endfor %}
+#listen  proxy-swift-proxy
+#    bind {{ internal_vip.ip }}:8080
+#    bind {{ public_vip.ip }}:8080
+#    balance  source
+#    option  tcpka
+#    option  tcplog
+#{% for host,ip in haproxy_hosts.items() %}
+#    server {{ host }} {{ ip }}:8080 weight 1 check inter 2000 rise 2 fall 5
+#{% endfor %}
 
 listen  proxy-ceilometer_api_cluster
     bind {{ internal_vip.ip }}:8777
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml
index 9ce499da..ac548a09 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/vars/main.yml
@@ -92,13 +92,13 @@ os_services:
     internalurl: "http://{{ internal_vip.ip }}:8000/v1"
     adminurl: "http://{{ internal_vip.ip }}:8000/v1"
 
-  - name: swift
-    type: object-store
-    region: RegionOne
-    description: "OpenStack Object Storage"
-    publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
-    internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
-    adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+#  - name: swift
+#    type: object-store
+#    region: RegionOne
+#    description: "OpenStack Object Storage"
+#    publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+#    internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+#    adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
 
 os_users:
   - user: admin
@@ -171,9 +171,9 @@ os_users:
     tenant: demo
     tenant_description: "Demo Tenant"
 
-  - user: swift
-    password: "{{ CINDER_PASS }}"
-    email: swift@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
+#  - user: swift
+#    password: "{{ CINDER_PASS }}"
+#    email: swift@admin.com
+#    role: admin
+#    tenant: service
+#    tenant_description: "Service Tenant"
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml
index 9edd22dc..e4142b5f 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-compute.yml
@@ -15,6 +15,6 @@
   with_items:
     - nova-compute
 
-- name: restart swift task
-  shell: swift-init all start
-  ignore_errors: True
+#- name: restart swift task
+#  shell: swift-init all start
+#  ignore_errors: True
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
index 62f53ab9..7a507c88 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/tasks/moon-controller.yml
@@ -128,7 +128,7 @@
     sudo chmod g+rw /var/log/moon/keystonemiddleware.log;
     sudo chmod g+rw /var/log/moon/system.log;
     sudo adduser keystone moonlog;
-    sudo adduser swift moonlog;
+    # sudo adduser swift moonlog;
     sudo adduser nova moonlog;
 
 
@@ -217,8 +217,8 @@
 - name: update api-paste.ini
   template: src=api-paste.ini dest=/etc/nova/api-paste.ini backup=yes
 
-- name: update proxy-server conf
-  template: src=proxy-server.conf dest=/etc/swift/proxy-server.conf backup=yes
+#- name: update proxy-server conf
+#  template: src=proxy-server.conf dest=/etc/swift/proxy-server.conf backup=yes
 
 # restart nova
 - name: restart nova
@@ -231,8 +231,8 @@
     - nova-scheduler
 
 # restart swift
-- name: restart swift
-  service: name={{ item }} state=restarted enabled=yes
-  with_items:
-    - swift-proxy
-    - memcached
+#- name: restart swift
+#  service: name={{ item }} state=restarted enabled=yes
+#  with_items:
+#    - swift-proxy
+#    - memcached
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
index aad55d05..cff8c7c2 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/moon/vars/main.yml
@@ -92,13 +92,13 @@ os_services:
     internalurl: "http://{{ internal_vip.ip }}:8000/v1"
     adminurl: "http://{{ internal_vip.ip }}:8000/v1"
 
-  - name: swift
-    type: object-store
-    region: RegionOne
-    description: "OpenStack Object Storage"
-    publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
-    internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
-    adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+#  - name: swift
+#    type: object-store
+#    region: RegionOne
+#    description: "OpenStack Object Storage"
+#    publicurl: "http://{{ public_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+#    internalurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
+#    adminurl: "http://{{ internal_vip.ip }}:8080/v1/AUTH_%(tenant_id)s"
 
 os_users:
   - user: admin
@@ -164,9 +164,9 @@ os_users:
     tenant: demo
     tenant_description: "Demo Tenant"
 
-  - user: swift
-    password: "{{ CINDER_PASS }}"
-    email: swift@admin.com
-    role: admin
-    tenant: service
-    tenant_description: "Service Tenant"
+#  - user: swift
+#    password: "{{ CINDER_PASS }}"
+#    email: swift@admin.com
+#    role: admin
+#    tenant: service
+#    tenant_description: "Service Tenant"