1013e6f0c0
Previously the --limit from tripleoclient assumed an operator would only
use a comma ','. It now converts all limit formats into a standardized format
that will always be colon ':' separated instead. This patch corrects issues
with upgrade tasks in Train and newer.
Conflicts:
deployment/cinder/cinder-backup-pacemaker-puppet.yaml
deployment/cinder/cinder-volume-pacemaker-puppet.yaml
deployment/database/mysql-pacemaker-puppet.yaml
deployment/database/redis-pacemaker-puppet.yaml
deployment/haproxy/haproxy-pacemaker-puppet.yaml
deployment/manila/manila-share-pacemaker-puppet.yaml
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
Change-Id: Icbd6b8568a697cbb0cf5740fc1a6c17b2b001c0e
Related-Change-Id: I190f6efe8d728f124c18ce80be715ae7c5c0da01
Signed-off-by: Luke Short <ekultails@gmail.com>
(cherry picked from commit
|
||
---|---|---|
.. | ||
mysql-base.yaml | ||
mysql-client.yaml | ||
mysql-container-puppet.yaml | ||
mysql-pacemaker-puppet.yaml | ||
redis-base-puppet.yaml | ||
redis-container-puppet.yaml | ||
redis-pacemaker-puppet.yaml |