diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-09 17:02:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-09 17:02:55 +0000 |
| commit | f190469c01156237cbadf75981bc789b8d2cf0e1 (patch) | |
| tree | 6ea2088d3589ab69eb10809b9e95b94e1c1ea25b /puppet/services/network/contrail-webui.yaml | |
| parent | aa842a1575b15e4d31c9dcfa6298391322ca15c8 (diff) | |
| parent | da91bb6e1e041b4462765c87ff36458528d952e8 (diff) | |
Merge "Re-organizes Contrail services to the correct roles"
Diffstat (limited to 'puppet/services/network/contrail-webui.yaml')
| -rw-r--r-- | puppet/services/network/contrail-webui.yaml | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/puppet/services/network/contrail-webui.yaml b/puppet/services/network/contrail-webui.yaml index 72cc6fa5..3786cdd1 100644 --- a/puppet/services/network/contrail-webui.yaml +++ b/puppet/services/network/contrail-webui.yaml @@ -21,27 +21,6 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - ContrailWebUiAnalyticsVip: - description: Contrail Analytics VIP - type: string - ContrailWebUiConfigVip: - description: Contrail Config VIP - type: string - ContrailWebUiNeutronVip: - description: Neutron VIP - type: string - ContrailWebuiHttpPort: - default: 8080 - description: HTTP Port of Webui - type: number - ContrailWebuiHttpsPort: - default: 8143 - description: HTTPS Port of Webui - type: number - ContrailWebUiRedisIp: - description: Redis IP - type: string - default: '127.0.0.1' resources: ContrailBase: @@ -59,11 +38,8 @@ outputs: config_settings: map_merge: - get_attr: [ContrailBase, role_data, config_settings] - - contrail::webui::contrail_analytics_vip: {get_param: ContrailWebUiAnalyticsVip} - contrail::webui::contrail_config_vip: {get_param: ContrailWebUiConfigVip} - contrail::webui::contrail_webui_http_port: {get_param: ContrailWebuiHttpPort} - contrail::webui::contrail_webui_https_port: {get_param: ContrailWebuiHttpsPort} - contrail::webui::neutron_vip: {get_param: ContrailWebUiNeutronVip} - contrail::webui::redis_ip: {get_param: ContrailWebUiRedisIp} + - contrail::webui::http_port: {get_param: [EndpointMap, ContrailWebuiHttpInternal, port] } + contrail::webui::https_port: {get_param: [EndpointMap, ContrailWebuiHttpsInternal, port] } + contrail::webui::redis_ip: '127.0.0.1' step_config: | include ::tripleo::network::contrail::webui |