From f25a863fc6e2c02043f083b691fd28874156db1f Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Mon, 19 Feb 2018 15:44:07 -0600 Subject: [PATCH] Make armada comply with schema - Updates to the Armada yaml file to comply with JSON schemas Change-Id: I182f9177510b0be7f299a3e5e9e0ba604046381e --- manifests/basic_ucp/armada.yaml.sub | 54 +++++++++++++---------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/manifests/basic_ucp/armada.yaml.sub b/manifests/basic_ucp/armada.yaml.sub index 00d7ed2d..296b71d4 100644 --- a/manifests/basic_ucp/armada.yaml.sub +++ b/manifests/basic_ucp/armada.yaml.sub @@ -332,19 +332,18 @@ data: no_hooks: false upgrade: no_hooks: false - pre: - delete: - - name: keystone-db-sync - type: job - labels: - - job-name: keystone-db-sync - - name: keystone-db-init - type: job - labels: - - job-name: keystone-db-init - post: - delete: [] - create: [] + pre: + delete: + - name: keystone-db-sync + type: job + labels: + job-name: keystone-db-sync + - name: keystone-db-init + type: job + labels: + job-name: keystone-db-init + post: + create: [] values: conf: keystone: @@ -378,12 +377,11 @@ data: no_hooks: false upgrade: no_hooks: false - pre: - delete: [] - create: [] - post: - delete: [] - create: [] + pre: + delete: [] + create: [] + post: + create: [] values: endpoints: postgresql: @@ -593,11 +591,10 @@ data: no_hooks: false upgrade: no_hooks: false - pre: - delete: [] - post: - delete: [] - create: [] + pre: + delete: [] + post: + create: [] values: pod: replicas: @@ -740,11 +737,10 @@ data: no_hooks: false upgrade: no_hooks: false - pre: - delete: [] - post: - delete: [] - create: [] + pre: + delete: [] + post: + create: [] values: pod: replicas: