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-control.yaml | |
parent | aa842a1575b15e4d31c9dcfa6298391322ca15c8 (diff) | |
parent | da91bb6e1e041b4462765c87ff36458528d952e8 (diff) |
Merge "Re-organizes Contrail services to the correct roles"
Diffstat (limited to 'puppet/services/network/contrail-control.yaml')
-rw-r--r-- | puppet/services/network/contrail-control.yaml | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/puppet/services/network/contrail-control.yaml b/puppet/services/network/contrail-control.yaml index 7c28d283..0964989b 100644 --- a/puppet/services/network/contrail-control.yaml +++ b/puppet/services/network/contrail-control.yaml @@ -21,15 +21,14 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json - ContrailControlHostIP: - description: host IP address of Analytics - type: string - ContrailControlIfmapUserName: - description: Ifmap user name - type: string - ContrailControlIfmapUserPassword: - description: Ifmap user password + ContrailControlASN: + description: Autonomous System Number + type: number + default: 64512 + ContrailControlRNDCSecret: + description: sda1/256 hmac key, e.g. echo -n "values" | openssl dgst -sha256 -hmac key -binary | base64 type: string + hidden: true resources: ContrailBase: @@ -47,8 +46,8 @@ outputs: config_settings: map_merge: - get_attr: [ContrailBase, role_data, config_settings] - - contrail::control::host_ip: {get_param: ContrailControlHostIP} - contrail::control::ifmap_username: {get_param: ContrailControlIfmapUserName} - contrail::control::ifmap_password: {get_param: ContrailControlIfmapUserPassword} + - contrail::control::asn: {get_param: ContrailControlASN } + contrail::control::host_ip: {get_param: [ServiceNetMap, ContrailControlNetwork]} + contrail::control::rndc_secret: {get_param: ContrailControlRNDCSecret} step_config: | include ::tripleo::network::contrail::control |