Added version check for provider/driver backwards compatibility
This commit is contained in:
		
							parent
							
								
									29d4a55828
								
							
						
					
					
						commit
						e26b805279
					
				| @ -15,5 +15,9 @@ ec2_ubuntu_public: | ||||
|   location: eu-west-1 | ||||
|   availability_zone: eu-west-1a | ||||
|   ssh_username: ubuntu | ||||
|   {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %} | ||||
|   driver: ec2 | ||||
|   {%- else %} | ||||
|   provider: ec2 | ||||
|   {%- endif %} | ||||
| {%- endif %} | ||||
|  | ||||
| @ -10,5 +10,9 @@ gce: | ||||
|     master: {{ cloud.get('master', 'salt') }} | ||||
|   grains: | ||||
|     test: True | ||||
|   {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %} | ||||
|   driver: gce | ||||
|   {%- else %} | ||||
|   provider: gce | ||||
|   {%- endif %} | ||||
| {%- endif %} | ||||
|  | ||||
| @ -14,7 +14,11 @@ rsos_{{ region|lower }}: | ||||
|   compute_name: cloudServersOpenStack | ||||
|   protocol: ipv4 | ||||
|   compute_region: {{ region }} | ||||
|   {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %} | ||||
|   driver: openstack | ||||
|   {%- else %} | ||||
|   provider: openstack | ||||
|   {%- endif %} | ||||
|   user:  {{ cloud.get('rsos_user', 'DEFAULT') }} | ||||
|   tenant: {{ cloud.get('rsos_tenant', 'DEFAULT') }} | ||||
|   apikey: {{ cloud.get('rsos_apikey', 'DEFAULT') }} | ||||
|  | ||||
| @ -3,6 +3,10 @@ | ||||
| {% set cloud = salt['pillar.get']('salt:cloud', {}) -%} | ||||
| 
 | ||||
| saltify: | ||||
|   {%- if grains.saltversioninfo[0] >= 2016 or (grains.saltversioninfo[0] >= 2015 and grains.saltversioninfo[1] >= 8) %} | ||||
|   driver: saltify | ||||
|   {%- else %} | ||||
|   provider: saltify | ||||
|   {%- endif %} | ||||
|   minion: | ||||
|     master: {{ cloud.get('master', 'salt') }} | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 John Galt
						John Galt