Bug/1259964

.gitreview

@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=stackforge/fuel-library.git

deployment/puppet/ceilometer/manifests/agent/central.pp

@@ -110,8 +110,6 @@
     cs_shadow { $res_name: cib => $cib_name }
     cs_commit { $res_name: cib => $cib_name }
 
-    ::corosync::cleanup{ $res_name: }
-
     service { 'ceilometer-agent-central':
       ensure     => $service_ensure,
       name       => $res_name,
@@ -121,9 +119,6 @@
       provider   => "pacemaker",
     }
 
-    Cs_commit[$res_name] -> ::Corosync::Cleanup[$res_name]
-    Cs_commit[$res_name] ~> ::Corosync::Cleanup[$res_name]
-
     Cs_shadow[$res_name] ->
       Cs_resource[$res_name] ->
         Cs_commit[$res_name] ->

deployment/puppet/cluster/manifests/haproxy.pp

@@ -22,8 +22,7 @@
 
   Anchor['haproxy'] -> Cs_shadow["$cib_name"]
 
-  corosync::cleanup {"clone_$cib_name": }
-  Cs_commit[$cib_name] ~> Corosync::Cleanup["clone_$cib_name"] -> Service['haproxy']
+  Cs_commit[$cib_name] -> Service['haproxy']
 
   file {'haproxy-ocf':
     path=>'/usr/lib/ocf/resource.d/mirantis/haproxy',

deployment/puppet/cluster/manifests/virtual_ip.pp

@@ -23,10 +23,7 @@
 
   cs_shadow { $cib_name: cib => $cib_name }
   cs_commit { $cib_name: cib => $cib_name }
-  ::corosync::cleanup { $vip_name: }
 
-  Cs_commit[$cib_name] -> ::Corosync::Cleanup[$vip_name]
-  Cs_commit[$cib_name] ~> ::Corosync::Cleanup[$vip_name]
 
   cs_resource { $vip_name:
     ensure          => present,
@@ -67,4 +64,4 @@
   Corosync::Service['pacemaker'] -> Cluster::Virtual_ip <||>
 }
 #
-###
+###

deployment/puppet/galera/manifests/init.pp

@@ -146,9 +146,8 @@
 
   cs_shadow { $res_name: cib => $cib_name }
   cs_commit { $res_name: cib => $cib_name }
-  ::corosync::cleanup { "clone_$res_name": }
 
-  Cs_commit["$res_name"] ~> Corosync::Cleanup["clone_$res_name"] -> Service["mysql"]
+  Cs_commit["$res_name"] -> Service["mysql"]
 
   cs_resource { "$res_name":
       ensure => present,

deployment/puppet/heat/manifests/engine.pp

@@ -63,8 +63,6 @@
       cib => $service_name,
     }
 
-    corosync::cleanup { $service_name : }
-
     cs_resource { $service_name :
       ensure          => present,
       cib             => $service_name,
@@ -78,7 +76,7 @@
       },
     }
 
-    Heat_config<||> -> File['heat-engine-ocf'] -> Cs_shadow[$service_name] -> Cs_resource[$service_name] -> Cs_commit[$service_name] ~> Corosync::Cleanup[$service_name] -> Service['heat-engine']
+    Heat_config<||> -> File['heat-engine-ocf'] -> Cs_shadow[$service_name] -> Cs_resource[$service_name] -> Cs_commit[$service_name] -> Service['heat-engine']
 
   }
 

deployment/puppet/murano/manifests/dashboard.pp

@@ -62,7 +62,7 @@
     ensure => installed,
   }
 
-  Package[$dashboard_deps] -> Package['murano_dashboard'] -> File[$modify_config] -> Exec['fix_horizon_config'] -> File[$murano_log_file] -> Exec['collect_static'] -> Service <| title == 'httpd' |>
+  Package[$dashboard_deps] -> Package['murano_dashboard'] -> File[$modify_config] -> Exec['fix_horizon_config'] -> File[$murano_log_file] -> File <| title == "${::horizon::params::logdir}/horizon.log" |> -> Exec['collect_static'] -> Service <| title == 'httpd' |>
   Package['murano_dashboard'] ~> Service <| title == 'httpd' |>
   Exec['fix_horizon_config'] ~> Service <| title == 'httpd' |>
 

deployment/puppet/mysql/manifests/server.pp

@@ -82,10 +82,6 @@
     $allowed_hosts = '%'
     #$allowed_hosts = 'localhost'
 
-    ::corosync::cleanup{"p_${service_name}": } 
-    Cs_commit['mysql']->::Corosync::Cleanup["p_${service_name}"]
-    Cs_commit['mysql']~>::Corosync::Cleanup["p_${service_name}"]
-    ::Corosync::Cleanup["p_${service_name}"] -> Service['mysql']
 
     create_resources( 'class', { 'mysql::config' => $config_hash })
     Class['mysql::config'] -> Cs_resource["p_${service_name}"]

deployment/puppet/nailgun/files/venv-ostf.txt

@@ -22,7 +22,7 @@ logutils==0.3.3
 netaddr==0.7.10
 nose==1.3.0
 ordereddict==1.1
-oslo.config==1.1.1
+oslo.config==1.2.0
 paramiko==1.10.1
 pbr==0.5.21
 pecan==0.3.0
@@ -32,20 +32,19 @@ psycopg2==2.5.1
 pyOpenSSL==0.13
 pycrypto==2.6
 pyparsing==1.5.7
-python-cinderclient==1.0.4
-python-heatclient==0.2.2
-python-glanceclient==0.9.0
-python-keystoneclient==0.2.4
+python-cinderclient==1.0.6
+python-ceilometerclient==1.0.6
+python-heatclient==0.2.5
+python-keystoneclient==0.4.1
 python-mimeparse==0.1.4
-python-muranoclient==0.2
-python-novaclient==2.12.0
-python-savannaclient==0.2.2
-python-quantumclient==2.2.3
-requests==1.2.3
+python-muranoclient==0.2.11
+python-novaclient==2.15.0
+python-savannaclient==0.3
+requests==1.1
 setuptools-git==1.0
 simplegeneric==0.8.1
 simplejson==3.3.0
-six==1.3.0
+six==1.4.1
 stevedore==0.10
 testresources==0.2.7
 testtools==0.9.32

deployment/puppet/nailgun/templates/root_ssh_config.erb

@@ -1,4 +1,4 @@
-Host slave-* controller-* compute-* storage-* 10.* 192.168.* 172.30.* 172.31.* 172.2?.* 172.1?.*
+Host node-* controller-* compute-* storage-* 10.* 192.168.* 172.30.* 172.31.* 172.2?.* 172.1?.*
 CheckHostIP no
 IdentityFile ~/.ssh/bootstrap.rsa
 IdentityFile ~/.ssh/id_rsa

deployment/puppet/neutron/files/ocf/neutron-agent-ovs

@@ -38,7 +38,6 @@ OCF_RESKEY_plugin_config_default="/etc/neutron/plugins/openvswitch/ovs_neutron_p
 OCF_RESKEY_user_default="neutron"
 OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid"
 OCF_RESKEY_amqp_server_port_default="5672"
-OCF_RESKEY_integration_bridge_default="br-int"
 OCF_RESKEY_segmentation_bridge_default="br-tun"
 OCF_RESKEY_log_file_default="/var/log/neutron/ovs-agent.log"
 OCF_RESKEY_debug_default='false'
@@ -49,7 +48,6 @@ OCF_RESKEY_debug_default='false'
 : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}}
 : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}}
 : ${OCF_RESKEY_amqp_server_port=${OCF_RESKEY_amqp_server_port_default}}
-: ${OCF_RESKEY_integration_bridge=${OCF_RESKEY_integration_bridge_default}}
 : ${OCF_RESKEY_segmentation_bridge=${OCF_RESKEY_segmentation_bridge_default}}
 : ${OCF_RESKEY_log_file=${OCF_RESKEY_log_file_default}}
 : ${OCF_RESKEY_debug=${OCF_RESKEY_debug_default}}
@@ -89,25 +87,25 @@ creates a distributed neutron-ovs-agent cluster.
 
 <parameter name="binary" unique="0" required="0">
 <longdesc lang="en">
-Location of the OpenStack OVS Server server binary (${OCF_RESKEY_binary})
+Location of the OpenStack OVS agent binary (${OCF_RESKEY_binary})
 </longdesc>
-<shortdesc lang="en">OpenStack OVS Server server binary (${OCF_RESKEY_binary})</shortdesc>
+<shortdesc lang="en">OpenStack OVS agent  binary (${OCF_RESKEY_binary})</shortdesc>
 <content type="string" default="${OCF_RESKEY_binary_default}" />
 </parameter>
 
 <parameter name="config" unique="0" required="0">
 <longdesc lang="en">
 Location of the OpenStack Neutron Service (neutron-server) configuration file
 </longdesc>
-<shortdesc lang="en">OpenStack OVS Server (neutron-server) config file</shortdesc>
+<shortdesc lang="en">OpenStack Neutron Server (neutron-server) config file</shortdesc>
 <content type="string" default="${OCF_RESKEY_config_default}" />
 </parameter>
 
 <parameter name="plugin_config" unique="0" required="0">
 <longdesc lang="en">
-Location of the OpenStack OVS Service (${OCF_RESKEY_binary}) configuration file
+Location of the OpenStack OVS agent (${OCF_RESKEY_binary}) configuration file
 </longdesc>
-<shortdesc lang="en">OpenStack OVS Server (${OCF_RESKEY_binary}) config file</shortdesc>
+<shortdesc lang="en">OpenStack OVS agent (${OCF_RESKEY_binary}) config file</shortdesc>
 <content type="string" default="${OCF_RESKEY_plugin_config_default}" />
 </parameter>
 
@@ -136,14 +134,6 @@ Additional parameters to pass on to the OpenStack OVS Service (${OCF_RESKEY_bina
 <content type="string" />
 </parameter>
 
-<parameter name="integration_bridge" unique="0" required="0">
-<longdesc lang="en">
-OVS integration bridge name OpenStack OVS Service (${OCF_RESKEY_binary})
-</longdesc>
-<shortdesc lang="en">Integration bridge name for neutron-ovs-agent</shortdesc>
-<content type="string" default="${OCF_RESKEY_integration_bridge_default}"/>
-</parameter>
-
 <parameter name="segmentation_bridge" unique="0" required="0">
 <longdesc lang="en">
 OVS integration bridge name OpenStack OVS Service (${OCF_RESKEY_binary})
@@ -240,7 +230,7 @@ neutron_ovs_agent_status() {
     # compare PID from file with PID from `pgrep...`
     f_pid=`cat $OCF_RESKEY_pid | tr '\n' ' ' | awk '{print $1}'`
     if [ "xxx$pid" == "xxx$f_pid" ]; then
-        return $OCF_NOT_RUNNING
+        return $OCF_SUCCESS
     fi
 
     # at this point we have PID file and PID from it
@@ -266,28 +256,9 @@ neutron_ovs_agent_monitor() {
 }
 
 
-clean_and_recreate_ovs_bridges() {
-    ocf_log info "cleaning up integration bridge"
-    ovs-vsctl -- --if-exists del-br ${OCF_RESKEY_segmentation_bridge}
-    rc=$?
-    if [ $rc -ne 0 ]; then
-        ocf_log err "Could not clean up segmentation bridge ${OCF_RESKEY_segmentation_bridge}"
-        exit $OCF_ERR_GENERIC
-    fi
-    ocf_log info "cleaning up segmentation bridge"
-    ovs-vsctl -- --if-exists del-br ${OCF_RESKEY_integration_bridge}
-    rc=$?
-    if [ $rc -ne 0 ]; then
-        ocf_log err "Could not clean up integration bridge ${OCF_RESKEY_integration_bridge}"
-        exit $OCF_ERR_GENERIC
-    fi
-    ocf_log info "recreating integration bridge"
-    ovs-vsctl -- --may-exist add-br ${OCF_RESKEY_integration_bridge}
-    rc=$?
-    if [ $rc -ne 0 ]; then
-        ocf_log err "Could not start up integration bridge ${OCF_RESKEY_integration_bridge}"
-        exit $OCF_ERR_GENERIC
-    fi
+cleanup_agents_ovs_bridges() {
+    # todo: remove ports, created by agent
+    rc=0
 }
 
 
@@ -297,11 +268,11 @@ neutron_ovs_agent_start() {
     neutron_ovs_agent_status
     rc=$?
     if [ $rc -eq $OCF_SUCCESS ]; then
-        ocf_log info "OpenStack OVS Server (${OCF_RESKEY_binary}) already running"
+        ocf_log info "OpenStack OVS agent (${OCF_RESKEY_binary}) already running"
         return $OCF_SUCCESS
     fi
 
-    clean_and_recreate_ovs_bridges
+    cleanup_agents_ovs_bridges
 
     # run and detach to background Neutron-ovs-agent as daemon.
     # Don't use ocf_run as we're sending the tool's output
@@ -322,7 +293,7 @@ neutron_ovs_agent_start() {
         sleep 3
     done
 
-    ocf_log info "OpenStack OVS Server (${OCF_RESKEY_binary}) started"
+    ocf_log info "OpenStack OVS agent (${OCF_RESKEY_binary}) started"
     return $OCF_SUCCESS
 }
 
@@ -333,18 +304,24 @@ neutron_ovs_agent_stop() {
     neutron_ovs_agent_status
     rc=$?
     if [ $rc -eq $OCF_NOT_RUNNING ]; then
-        clean_and_recreate_ovs_bridges
-        ocf_log info "OpenStack OVS Server (${OCF_RESKEY_binary}) already stopped"
+        cleanup_agents_ovs_bridges
+        ocf_log info "OpenStack OVS agent (${OCF_RESKEY_binary}) already stopped"
         return $OCF_SUCCESS
     fi
 
     # Try SIGTERM
-    pid=`cat $OCF_RESKEY_pid`
-    pid="$pid `ps ax | grep -v grep | grep 'dnsmasq' | cut -c1-5`"
+
+    pid=`get_worker_pid`
+    if [ "xxx$pid" == "xxx" ] ; then
+        ocf_log warn "OpenStack Neutron agent '$OCF_RESKEY_binary' not running."
+        #return $OCF_NOT_RUNNING
+        return $OCF_SUCCESS
+    fi
+
     ocf_run kill -s TERM $pid
     rc=$?
     if [ $rc -ne 0 ]; then
-        ocf_log err "OpenStack OVS Server (${OCF_RESKEY_binary}) couldn't be stopped"
+        ocf_log err "OpenStack OVS agent (${OCF_RESKEY_binary}) couldn't be stopped"
         exit $OCF_ERR_GENERIC
     fi
 
@@ -362,21 +339,21 @@ neutron_ovs_agent_stop() {
         fi
         count=`expr $count + 1`
         sleep 1
-        ocf_log debug "OpenStack OVS Server (${OCF_RESKEY_binary}) still hasn't stopped yet. Waiting ..."
+        ocf_log debug "OpenStack OVS agent (${OCF_RESKEY_binary}) still hasn't stopped yet. Waiting ..."
     done
 
     neutron_ovs_agent_status
     rc=$?
     if [ $rc -ne $OCF_NOT_RUNNING ]; then
         # SIGTERM didn't help either, try SIGKILL
-        ocf_log info "OpenStack OVS Server (${OCF_RESKEY_binary}) failed to stop after ${shutdown_timeout}s \
+        ocf_log info "OpenStack OVS agent (${OCF_RESKEY_binary}) failed to stop after ${shutdown_timeout}s \
           using SIGTERM. Trying SIGKILL ..."
         ocf_run kill -s KILL $pid
     fi
 
-    clean_and_recreate_ovs_bridges
+    cleanup_agents_ovs_bridges
 
-    ocf_log info "OpenStack OVS Server (${OCF_RESKEY_binary}) stopped"
+    ocf_log info "OpenStack OVS agent (${OCF_RESKEY_binary}) stopped"
 
     rm -f $OCF_RESKEY_pid
 

deployment/puppet/neutron/manifests/agents/dhcp.pp

@@ -11,33 +11,33 @@
 ) {
   include 'neutron::params'
 
+  if $::neutron::params::dhcp_agent_package {
+    Package['neutron'] -> Package['neutron-dhcp-agent']
+
+    $dhcp_agent_package = 'neutron-dhcp-agent'
+
+    package { 'neutron-dhcp-agent':
+      name   => $::neutron::params::dhcp_agent_package
+    }
+  } else {
+    $dhcp_agent_package = $::neutron::params::package_name
+  }
   if $::operatingsystem == 'Ubuntu' {
     file { '/etc/init/neutron-dhcp-agent.override':
      replace => 'no',
      ensure => 'present',
      content => 'manual',
      mode => 644,
-    } -> Package['neutron-dhcp-agent']
+    } -> Package<| title=="$dhcp_agent_package" |>
     if $service_provider != 'pacemaker' {
-       Package['neutron-dhcp-agent'] ->
+       Package<| title=="$dhcp_agent_package" |> ->
        exec { 'rm-neutron-dhcp-override':
          path => '/sbin:/bin:/usr/bin:/usr/sbin',
          command => "rm -f /etc/init/neutron-dhcp-agent.override",
        }
     }
   }
 
-  if $::neutron::params::dhcp_agent_package {
-    Package['neutron'] -> Package['neutron-dhcp-agent']
-
-    $dhcp_agent_package = 'neutron-dhcp-agent'
-
-    package { 'neutron-dhcp-agent':
-      name   => $::neutron::params::dhcp_agent_package
-    }
-  } else {
-    $dhcp_agent_package = $::neutron::params::package_name
-  }
 
   include 'neutron::waist_setup'
 
@@ -230,8 +230,9 @@
 
   Anchor['neutron-dhcp-agent'] ->
     Cs_resource<| title=="p_${::neutron::params::dhcp_agent_service}" |> ->
-      Service['neutron-dhcp-service'] ->
-        Anchor['neutron-dhcp-agent-done']
+      Cs_commit <| title== 'dhcp' |> ->
+        Service['neutron-dhcp-service'] ->
+          Anchor['neutron-dhcp-agent-done']
 
   anchor {'neutron-dhcp-agent-done': }