Merge "Remove the useless host in site.yml"

This commit is contained in:
Jenkins 2016-09-14 16:12:28 +00:00 committed by Gerrit Code Review
commit f6054d40a5

@ -82,7 +82,6 @@
- hosts: - hosts:
- keystone - keystone
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: keystone, - { role: keystone,
@ -94,8 +93,6 @@
- swift-container-server - swift-container-server
- swift-object-server - swift-object-server
- swift-proxy-server - swift-proxy-server
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: swift, - { role: swift,
@ -106,8 +103,6 @@
- ceph-mon - ceph-mon
- glance-api - glance-api
- glance-registry - glance-registry
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: glance, - { role: glance,
@ -117,14 +112,11 @@
- hosts: - hosts:
- ceph-mon - ceph-mon
- compute - compute
- glance-api
- nova-api - nova-api
- nova-conductor - nova-conductor
- nova-consoleauth - nova-consoleauth
- nova-novncproxy - nova-novncproxy
- nova-scheduler - nova-scheduler
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: nova, - { role: nova,
@ -141,8 +133,6 @@
- neutron-metadata-agent - neutron-metadata-agent
- compute - compute
- manila-share - manila-share
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: neutron, - { role: neutron,
@ -155,8 +145,6 @@
- cinder-backup - cinder-backup
- cinder-scheduler - cinder-scheduler
- cinder-volume - cinder-volume
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: cinder, - { role: cinder,
@ -167,8 +155,6 @@
- heat-api - heat-api
- heat-api-cfn - heat-api-cfn
- heat-engine - heat-engine
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: heat, - { role: heat,
@ -177,7 +163,6 @@
- hosts: - hosts:
- horizon - horizon
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: horizon, - { role: horizon,
@ -187,8 +172,6 @@
- hosts: - hosts:
- murano-api - murano-api
- murano-engine - murano-engine
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: murano, - { role: murano,
@ -200,8 +183,6 @@
- ironic-conductor - ironic-conductor
- ironic-inspector - ironic-inspector
- ironic-pxe - ironic-pxe
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: ironic, - { role: ironic,
@ -211,8 +192,6 @@
- hosts: - hosts:
- magnum-api - magnum-api
- magnum-conductor - magnum-conductor
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: magnum, - { role: magnum,
@ -223,8 +202,6 @@
- mistral-api - mistral-api
- mistral-engine - mistral-engine
- mistral-executor - mistral-executor
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: mistral, - { role: mistral,
@ -252,8 +229,6 @@
- manila-api - manila-api
- manila-share - manila-share
- manila-scheduler - manila-scheduler
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: manila, - { role: manila,
@ -281,8 +256,6 @@
- hosts: - hosts:
- aodh - aodh
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: aodh, - { role: aodh,
@ -302,8 +275,6 @@
- congress-api - congress-api
- congress-policy-engine - congress-policy-engine
- congress-datasource - congress-datasource
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: congress, - { role: congress,
@ -329,8 +300,6 @@
- watcher-api - watcher-api
- watcher-engine - watcher-engine
- watcher-applier - watcher-applier
- rabbitmq
- memcached
serial: '{{ "30%" if action == "upgrade" else "0" }}' serial: '{{ "30%" if action == "upgrade" else "0" }}'
roles: roles:
- { role: watcher, - { role: watcher,