Add dhcrelay monitor via supervisor to restart

Dockerctl can start dhcrelay, but not ensure it
stays running. Supervisord can handle this task,
so it should watch the pid of dhcrelay and trigger
restart if it exits.

Change-Id: I75909d25418e625a2b154125e9a76e22c7443e47
Closes-Bug: #1324152
Adapt keystone_endpoint for new upstream modules

New openstack modules (v4.0.0) use "${region}/${name}" as
"keystone_endpoint" resource name which is incompatible with old
"keystone" module. From the other hand, new upstream "keystone"
module (v4.0.0) is not compatible with old openstack modules.

This is a temporary workaround to support both old-style and new
"keystone_endpoint" names. It will allow us to use new modules
along with old ones during upstream synchronization process.

This workaround will be removed when we update "keystone" module
to the upstream 4.0.0 version.

Change-Id: Ib5c232599273f93b7806413316d35af176a21bb0
Implements: blueprint merge-openstack-puppet-modules
Fix /var/log/remote rotation template

- Put /var/log/remote rotation into an appropriate server role template
- Fix node names matching to exclude symlinks for IP addresses

Closes bug: #1329991
Closes bug: #1316957

Change-Id: Iacd96d6fa02b0c63c63ce5256cc832eda229dcc7
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
Limit HAProxy exec check to primary controller

HAProxy IP is controlled by Pacemaker/Corosync. Exec fails on all Slave controllers.
This patch limits exec check to primary controller only.

Change-Id: Ic8daace980f2cb01feeb1f8006c9ca22d4a6a8f2
Closes-Bug: 1329780
Related-Bug: 1321662
Sync puppetlabs-apt to 1.4.2

v1.4.2 7cc875aadc6460b8ca635c38078dcd824c0bc877

Change-Id: Ide0b7b074e5533083cfc944ccadb1cb2403962ce
Implements: blueprint merge-openstack-puppet-modules
Add missed 30-remote-log.conf for docker container

Add missed 30-remote.conf template for rsyslog docker container
Fix existing dependency issue (rsyslog::server wipes templates dir)
Fix default access and notification for rsyslog.d file resources
Purge confusing nailgun templates for syslog (not used anymore)

Closes-bug: #1328877

Change-Id: If6f256cfeeba5bee486dd45c34cbc56c9e721730
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
Merge "Add missed 30-remote-log.conf for docker container"
Fix high precision timestamps for UI logs matching

Fuel UI relies on the fixed timestamp pattern, so we have to
enable it back in syslog logging config.

Closes-bug: #1328877

Change-Id: Ib12779470f6bf91d26fbfa271c2af14e61535c54
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
Merge "Limit HAProxy exec check to primary controller"
more strong order in Neutron manifests

between keystone roles and inserting 'service' tenant-ID to the neutron config.

Change-Id: I9d6780fe924756643f34a597a1abd9e6189611ee
Closes-bug: #1328462
Merge "Fix high precision timestamps for UI logs matching"
Add list function to dockerctl

New dockerctl functions:
dockerctl list - outputs short name of each
available container
dockerctl list -l - outputs short name, image name,
status, and long container name of each container

Partial-Bug: #1324227

Change-Id: I30646db6d04bf8ff1f232c7e3021d790ec5d566a
Require socat package before checking nova-api in haproxy

Change-Id: Ibc11f23574e9c929cbea78ed9098b448cb7c47d3
Closes-bug: #1328504
Merge "Add dhcrelay monitor via supervisor to restart"
Merge "Require socat package before checking nova-api in haproxy"
Refactor mysql for upstream modules

Temporary workaround. Will not be needed after "mysql" module sync
with upstream code.

New OpenStack puppet modules (v4.0.0) require "mysql::config"
class. We need to provide it.

Implements: blueprint merge-openstack-puppet-modules

Change-Id: I5f928113a45991f7f0eb5b6a2e5e6a83f3c08a7b
Remove unused puppet module mmm

Change-Id: Iedcc3f97cc34abd3afe0c015bed3abbb80c23489
Implements: blueprint merge-openstack-puppet-modules
Fix path to astute.yaml

To merge review # 98743 we need to change
path to astute.yaml first, otherwise dhcrelay
starts only on deocker0 interface and slaves
are not being discovered.

Change-Id: Icce71a9ca7095397419d5a5afb746f7313d54573
Remove unused puppet module nagios

Change-Id: I8c2a3ecd16fcb674139120e1feb2a5269c1fde6a
Implements: blueprint merge-openstack-puppet-modules
Remove unnecessary files from puppet/astute directory

puppet/astute is not puppet module and not used by any
modules anymore, so it is deleted.

Change-Id: I141050ff2d33c148ad6d443b80a9482fc3869cd2
Implements: blueprint merge-openstack-puppet-modules