openstack/openstack-ansible
Code Issues Proposed changes

Fix maas_horizon_scheme and maas_heat_cfn_scheme variables

Browse Source 
Duplicate entries for "scheme" on horizon and heat_api_cfn mean that
this can't be overriden like the others.

* Remove "scheme: {{ maas_scheme }}" lines for both horizon and
  heat_api_cfn
* Ensures the overrides are possible

Fixes #36
This commit is contained in:
Andy McCrae 2014-08-27 15:38:26 +01:00
parent 6f6e75f549
commit f951ae263e
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc_deployment/playbooks/monitoring/maas_remote.yml
View File

@ -130,7 +130,6 @@
check_timeout: "{{ maas_check_timeout }}" check_timeout: "{{ maas_check_timeout }}"
monitoring_zones: "{{ maas_monitoring_zones }}" monitoring_zones: "{{ maas_monitoring_zones }}"
notification_plan: "{{ maas_notification_plan }}" notification_plan: "{{ maas_notification_plan }}"
scheme: "{{ maas_scheme }}"
scheme: "{{ maas_horizon_scheme | default(maas_scheme)}}" scheme: "{{ maas_horizon_scheme | default(maas_scheme)}}"
ip_address: "{{ external_vip_address }}" ip_address: "{{ external_vip_address }}"
port: 443 port: 443
@ -173,7 +172,6 @@
check_name: lb_api_check_heat_cfn check_name: lb_api_check_heat_cfn
monitoring_zones: "{{ maas_monitoring_zones }}" monitoring_zones: "{{ maas_monitoring_zones }}"
notification_plan: "{{ maas_notification_plan }}" notification_plan: "{{ maas_notification_plan }}"
scheme: "{{ maas_scheme }}"
scheme: "{{ maas_heat_cfn_scheme | default(maas_scheme)}}" scheme: "{{ maas_heat_cfn_scheme | default(maas_scheme)}}"
ip_address: "{{ external_vip_address }}" ip_address: "{{ external_vip_address }}"
port: 8000 port: 8000