openstack
/
fuel-library
Code Issues Proposed changes

Consume upstream rabbitmq-server v3.6.1 OCF RA 

* The package contains the OCF script now,
  remove it from Fuel's fuel-ha-utils.
* Rework the custom fuel rabbitmq-server OCF wrapper
  installation from the package, make it
  to invoke the upstream OCF RA from
  /usr/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
* Address some of TODO/FIXME as well.

Related blueprint upstream-rabbit-ocf

Change-Id: Iaa401685eb5e8dc514809eec426b9e550de609ac
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
This commit is contained in:
Bogdan Dobrelya 2016-05-18 10:49:55 +02:00
parent 2b6e4f4a30
commit ba8ba8eeed
8 changed files with 4 additions and 2280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/rules vendored
View File

@ -21,9 +21,6 @@ override_dh_fixperms:
override_dh_install:
dh_install
#TODO(dmitryme): remove rabbitmq-server-upstream once we switch to rabbitmq-3.5.7, as it will be included here
mv debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/rabbitmq debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/rabbitmq-server-upstream
mv debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/rabbitmq-fuel debian/fuel-ha-utils/usr/lib/ocf/resource.d/fuel/rabbitmq-server
mv debian/fuel-misc/usr/bin/logrotate debian/fuel-misc/usr/bin/fuel-logrotate
# Install fuel-library

2
deployment/puppet/cluster/manifests/rabbitmq_fence.pp
View File

@ -77,7 +77,7 @@ class cluster::rabbitmq_fence(
}
#https://bugs.launchpad.net/ubuntu/+source/corosync/+bug/1437368
#FIXME(bogdando) remove these hacks once the corosync package issues resolved
#FIXME(bogdando) remove these hacks after switched to systemd service.units
exec { 'fix_corosync_notifyd_init_args':
command => 'sed -i s/DAEMON_ARGS=\"\"/DAEMON_ARGS=\"-d\"/ /etc/init.d/corosync-notifyd',
onlyif => 'grep \'DAEMON_ARGS=""\' /etc/init.d/corosync-notifyd',

4
deployment/puppet/openstack/manifests/logging.pp
View File

@ -423,8 +423,4 @@ class openstack::logging (
Sahara_config <| title == 'DEFAULT/log_config' |> { ensure => absent }
Murano_config <| title == 'DEFAULT/log_config' |> { ensure => absent }
# lint:endignore
#TODO(bogdando) if 4.1.1 -> 5.0 upgrade will be supported later
# remove all existing rsyslog::imfile templates for Openstack
# and notify rsyslog service
}

1
deployment/puppet/openstack_tasks/manifests/openstack_controller/openstack_controller.pp
View File

@ -166,7 +166,6 @@ class openstack_tasks::openstack_controller::openstack_controller {
$nova_notify_on_state_change = 'vm_and_task_state'
# FIXME(bogdando) replace queue_provider for rpc_backend once all modules synced with upstream
$rpc_backend = 'nova.openstack.common.rpc.impl_kombu'
$amqp_hosts = hiera('amqp_hosts','')
$amqp_user = $rabbit_hash['user']

2
deployment/puppet/openstack_tasks/manifests/roles/compute.pp
View File

@ -319,7 +319,7 @@ class openstack_tasks::roles::compute {
# NOTE(bogdando) deploy compute node with disabled nova-compute
# service #LP1398817. The orchestration will start and enable it back
# after the deployment is done.
# FIXME(bogdando) This should be changed once the host aggregates implemented, bp disable-new-computes
# NOTE(bogdando) This maybe be changed, if the host aggregates implemented, bp disable-new-computes
class { '::nova::compute':
enabled => false,
vncserver_proxyclient_address => get_network_role_property('nova/api', 'ipaddr'),

2262
files/fuel-ha-utils/ocf/rabbitmq
View File

File diff suppressed because it is too large Load Diff

6
files/fuel-ha-utils/ocf/rabbitmq-fuel → files/fuel-ha-utils/ocf/rabbitmq-server
View File

@ -26,9 +26,5 @@ affected by this flag.
</parameter>
EOF
# That is 'rabbitmq' file in the current directory, but it is renamed to
# rabbitmq-server-upstream during packaging
#TODO(dmitryme): remove rabbitmq-server-upstream once we switch to
# rabbitmq-3.5.7, as it will be included here
upstream_rabbitmq_ocf_script="$(dirname $0)/rabbitmq-server-upstream"
upstream_rabbitmq_ocf_script="${OCF_ROOT}/resource.d/rabbitmq/rabbitmq-server-ha"
. $upstream_rabbitmq_ocf_script

4
specs/fuel-library10.0.spec
View File

@ -88,9 +88,7 @@ install -m 0755 %{files_source}/fuel-ha-utils/ocf/neutron-ovs-agent %{buildroot}
install -m 0755 %{files_source}/fuel-ha-utils/ocf/neutron-metadata-agent %{buildroot}/usr/lib/ocf/resource.d/fuel/neutron-metadata-agent
install -m 0755 %{files_source}/fuel-ha-utils/ocf/neutron-dhcp-agent %{buildroot}/usr/lib/ocf/resource.d/fuel/neutron-dhcp-agent
install -m 0755 %{files_source}/fuel-ha-utils/ocf/neutron-l3-agent %{buildroot}/usr/lib/ocf/resource.d/fuel/neutron-l3-agent
#TODO(dmitryme): remove rabbitmq-server-upstream once we switch to rabbitmq-3.5.7, as it will be included here
install -m 0755 %{files_source}/fuel-ha-utils/ocf/rabbitmq %{buildroot}/usr/lib/ocf/resource.d/fuel/rabbitmq-server-upstream
install -m 0755 %{files_source}/fuel-ha-utils/ocf/rabbitmq-fuel %{buildroot}/usr/lib/ocf/resource.d/fuel/rabbitmq-server
install -m 0755 %{files_source}/fuel-ha-utils/ocf/rabbitmq-server %{buildroot}/usr/lib/ocf/resource.d/fuel/rabbitmq-server
install -m 0755 %{files_source}/fuel-ha-utils/policy/set_rabbitmq_policy.sh %{buildroot}/usr/sbin/set_rabbitmq_policy
install -m 0755 %{files_source}/fuel-ha-utils/ocf/ns_IPaddr2 %{buildroot}/usr/lib/ocf/resource.d/fuel/ns_IPaddr2
install -m 0755 %{files_source}/fuel-ha-utils/ocf/ceilometer-agent-central %{buildroot}/usr/lib/ocf/resource.d/fuel/ceilometer-agent-central