diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-03-26 13:08:39 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-03-27 15:44:35 +0400 |
| commit | 6a1089b50dd5fbc4482c1590a116d7c75f82b734 (patch) | |
| tree | ad7d8da1c5e3d6231d88708d798cf25209322b90 /mcp/reclass/classes/cluster/mcp-common-ha | |
| parent | 16faba212fcb642eefc51bdb85538b5ae651350c (diff) | |
Rectify system reclass after update
* add opendaylight password (removed from system level)
* get updated ovn system class w/o mysql settings
* enable ceilometer user back (removed along with outdated service/endpoints)
* adjsut check interval of haproxy for noha scenarios since there is
only one backend for services, i.e. failover ain't expected
Change-Id: Iedee290e1cfcf838998bd44dc09a729d143974ac
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha')
3 files changed, 8 insertions, 0 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml b/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml index b28cfe74a..3ec73bec0 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml @@ -17,6 +17,7 @@ parameters: mcp_glusterfs: # yamllint disable-line rule:line-length source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main" + key: ${_param:linux_system_repo_mcp_glusterfs_key} pin: - package: '*' pin: release o=LP-PPA-gluster-glusterfs-${_param:glusterfs_version} diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml index f5678557d..93548f6bd 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control_init.yml @@ -13,17 +13,23 @@ classes: - system.keystone.client.service.nova-placement - system.keystone.client.service.cinder3 - system.keystone.client.service.designate + - system.keystone.client.service.ceilometer - system.keystone.client.service.gnocchi - system.keystone.client.service.panko - system.keystone.client.service.barbican - system.keystone.client.v3.service.keystone parameters: + _param: + ceilometer_endpoint_status: absent keystone: client: enabled: true resources: v3: enabled: true + services: + ceilometer: + status: absent server: identity: admin: diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 index 1cde4d43b..979669312 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_proxy.yml.j2 @@ -25,6 +25,7 @@ parameters: cluster_vip_address: ${_param:openstack_proxy_address} keepalived_openstack_web_public_vip_address: ${_param:cluster_vip_address} keepalived_openstack_web_public_vip_interface: ${_param:single_nic} + keepalived_openstack_web_public_vip_password: ${_param:opnfv_main_password} keepalived_vip_address: ${_param:openstack_proxy_control_address} keepalived_vip_interface: ${_param:control_nic} keepalived_vip_virtual_router_id: 240 |