diff options
| author |   Tony Hansen <tony@att.com> | 2017-10-10 13:39:42 +0000 |
|---|---|---|
| committer | Tony Hansen <tony@att.com> | 2017-10-10 13:39:52 +0000 |
| commit | 0169382eb76ed0d91b3de819bd51f6982c846a0e (patch) | |
| tree | 6dd5db8167b0c4a9c77b6202c29bb6904d0264cc /blueprints/pgaas-disk.yaml-template | |
| parent | 6d5cbab5f8d4274fd6058bad3666388814f40b6f (diff) | |
fix merge conflict
Change-Id: Id2a0760f7ca940646c9c42cd3cef497b4d579503
Signed-off-by: Tony Hansen <tony@att.com>
Issue-ID: DCAEGEN2-128
Diffstat (limited to 'blueprints/pgaas-disk.yaml-template')
| -rw-r--r-- | blueprints/pgaas-disk.yaml-template | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/pgaas-disk.yaml-template index 65244bf..fe1bb56 100644 --- a/blueprints/pgaas-disk.yaml-template +++ b/blueprints/pgaas-disk.yaml-template @@ -72,12 +72,9 @@ inputs: pgaas_cluster_name: type: string default: pgcl -<<<<<<< HEAD -======= cinder_volume_size: type: string default: 300 ->>>>>>> f62e307... update pgaas blueprints node_templates: key_pair: |