Merge "Update .sh references from openstack-keystone to openstack-core"

4 files changed, 8 insertions, 115 deletions

diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
index bf2ee330..2cbdc539 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_1.sh
@@ -12,10 +12,8 @@ fi
 if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname)" ]; then
     pcs resource disable httpd
     check_resource httpd stopped 1800
-    if pcs status | grep openstack-keystone; then
-        pcs resource disable openstack-keystone
-        check_resource openstack-keystone stopped 1800
-    fi
+    pcs resource disable openstack-core
+    check_resource openstack-core stopped 1800
     pcs resource disable redis
     check_resource redis stopped 600
     pcs resource disable mongod
diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
index 10bea573..28e279b0 100755
--- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
+++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh
@@ -55,10 +55,8 @@ if [ "$(hiera -c /etc/puppet/hiera.yaml bootstrap_nodeid)" = "$(facter hostname)
     check_resource rabbitmq started 600
     pcs resource enable redis
     check_resource redis started 600
-    if pcs status | grep openstack-keystone; then
-        pcs resource enable openstack-keystone
-        check_resource openstack-keystone started 1800
-    fi
+    pcs resource enable openstack-core
+    check_resource openstack-core started 1800
     pcs resource enable httpd
     check_resource httpd started 1800
 fi
diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index b2bdc55a..d9d00554 100755
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -18,8 +18,8 @@ if [ "$pacemaker_status" = "active" -a \
 
     pcs resource disable httpd
     check_resource httpd stopped 300
-    pcs resource disable openstack-keystone
-    check_resource openstack-keystone stopped 1800
+    pcs resource disable openstack-core
+    check_resource openstack-core stopped 1800
 
     if pcs status | grep haproxy-clone; then
         pcs resource restart haproxy-clone
@@ -30,8 +30,8 @@ if [ "$pacemaker_status" = "active" -a \
     pcs resource restart memcached-clone
     pcs resource restart galera-master
 
-    pcs resource enable openstack-keystone
-    check_resource openstack-keystone started 1800
+    pcs resource enable openstack-core
+    check_resource openstack-core started 1800
     pcs resource enable httpd
     check_resource httpd started 800
 
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index f3c3b4bf..b045e5ea 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -43,104 +43,8 @@ if [[ "$list_updates" == "" ]]; then
 fi
 
 pacemaker_status=$(systemctl is-active pacemaker)
-pacemaker_dumpfile=$(mktemp)
 
 if [[ "$pacemaker_status" == "active" ]] ; then
-SERVICES="memcached
-httpd
-neutron-dhcp-agent
-neutron-l3-agent
-neutron-metadata-agent
-neutron-openvswitch-agent
-neutron-server
-openstack-ceilometer-api
-openstack-ceilometer-central
-openstack-ceilometer-collector
-openstack-ceilometer-notification
-openstack-aodh-evaluator
-openstack-aodh-notifier
-openstack-aodh-listener
-openstack-cinder-api
-openstack-cinder-scheduler
-openstack-cinder-volume
-openstack-glance-api
-openstack-glance-registry
-openstack-heat-api
-openstack-heat-api-cfn
-openstack-heat-api-cloudwatch
-openstack-heat-engine
-openstack-keystone
-openstack-nova-api
-openstack-nova-conductor
-openstack-nova-consoleauth
-openstack-nova-novncproxy
-openstack-nova-scheduler"
-
-    echo "Dumping Pacemaker config"
-    pcs cluster cib $pacemaker_dumpfile
-
-    echo "Checking for missing constraints"
-
-    if ! pcs constraint order show | grep "start openstack-nova-novncproxy-clone then start openstack-nova-api-clone"; then
-        pcs -f $pacemaker_dumpfile constraint order start openstack-nova-novncproxy-clone then openstack-nova-api-clone
-    fi
-
-    if ! pcs constraint order show | grep "start rabbitmq-clone then start openstack-keystone-clone"; then
-        pcs -f $pacemaker_dumpfile constraint order start rabbitmq-clone then openstack-keystone-clone
-    fi
-
-    if ! pcs constraint order show | grep "promote galera-master then start openstack-keystone-clone"; then
-        pcs -f $pacemaker_dumpfile constraint order promote galera-master then openstack-keystone-clone
-    fi
-
-    if pcs resource | grep "haproxy-clone"; then
-        SERVICES="$SERVICES haproxy"
-        if ! pcs constraint order show | grep "start haproxy-clone then start openstack-keystone-clone"; then
-            pcs -f $pacemaker_dumpfile constraint order start haproxy-clone then openstack-keystone-clone
-        fi
-    fi
-
-    if ! pcs constraint order show | grep "start memcached-clone then start openstack-keystone-clone"; then
-        pcs -f $pacemaker_dumpfile constraint order start memcached-clone then openstack-keystone-clone
-    fi
-
-    if ! pcs constraint order show | grep "promote redis-master then start openstack-ceilometer-central-clone"; then
-        pcs -f $pacemaker_dumpfile constraint order promote redis-master then start openstack-ceilometer-central-clone require-all=false
-    fi
-
-    if ! pcs constraint order show | grep "promote redis-master then start openstack-aodh-evaluator-clone"; then
-        pcs -f $pacemaker_dumpfile constraint order promote redis-master then start openstack-aodh-evaluator-clone require-all=false
-    fi
-    # ensure neutron constraints https://review.openstack.org/#/c/229466
-    # remove ovs-cleanup after server and add openvswitch-agent instead
-    if  pcs constraint order show  | grep "start neutron-server-clone then start neutron-ovs-cleanup-clone"; then
-        pcs -f $pacemaker_dumpfile constraint remove order-neutron-server-clone-neutron-ovs-cleanup-clone-mandatory
-    fi
-    if ! pcs constraint order show | grep "start neutron-server-clone then start neutron-openvswitch-agent-clone"; then
-        pcs -f $pacemaker_dumpfile constraint order start neutron-server-clone then neutron-openvswitch-agent-clone
-    fi
-
-
-    if ! pcs resource defaults | grep "resource-stickiness: INFINITY"; then
-        pcs -f $pacemaker_dumpfile resource defaults resource-stickiness=INFINITY
-    fi
-
-    echo "Setting resource start/stop timeouts"
-    for service in $SERVICES; do
-        pcs -f $pacemaker_dumpfile resource update $service op start timeout=200s op stop timeout=200s
-    done
-    # mongod start timeout is higher, setting only stop timeout
-    pcs -f $pacemaker_dumpfile resource update mongod op start timeout=370s op  stop timeout=200s
-
-    echo "Making sure rabbitmq has the notify=true meta parameter"
-    pcs -f $pacemaker_dumpfile resource update rabbitmq meta notify=true
-
-    echo "Applying new Pacemaker config"
-    if ! pcs cluster cib-push $pacemaker_dumpfile; then
-        echo "ERROR failed to apply new pacemaker config"
-        exit 1
-    fi
-
     echo "Pacemaker running, stopping cluster node and doing full package update"
     node_count=$(pcs status xml | grep -o "<nodes_configured.*/>" | grep -o 'number="[0-9]*"' | grep -o "[0-9]*")
     if [[ "$node_count" == "1" ]] ; then
@@ -149,13 +53,6 @@ openstack-nova-scheduler"
     else
         pcs cluster stop
     fi
-
-    # clean leftover keepalived and radvd instances from neutron
-    # (can be removed when we remove neutron-netns-cleanup from cluster services)
-    # see https://review.gerrithub.io/#/c/248931/1/neutron-netns-cleanup.init
-    killall neutron-keepalived-state-change 2>/dev/null || :
-    kill $(ps ax | grep -e "keepalived.*\.pid-vrrp" | awk '{print $1}') 2>/dev/null || :
-    kill $(ps ax | grep -e "radvd.*\.pid\.radvd" | awk '{print $1}') 2>/dev/null || :
 else
     echo "Upgrading openstack-puppet-modules"
     yum -q -y update openstack-puppet-modules