Merge "Adds devstack plugin"

README.rst

@@ -8,7 +8,7 @@ Wiki - https://wiki.openstack.org/wiki/MagnetoDB
 
 IRC - #magnetodb at FreeNode
 
-Source code - https://github.com/stackforge/magnetodb
+Source code - https://git.openstack.org/stackforge/magnetodb
 
 Documentation - http://magnetodb.readthedocs.org/en/latest/
 

contrib/devstack/extras.d/90-magnetodb.sh

@@ -1,31 +0,0 @@
-if is_service_enabled magnetodb; then
-    if [[ "$1" == "source" ]]; then
-        # Initial source
-        source $TOP_DIR/lib/magnetodb
-    elif [[ "$1" == "stack" && "$2" == "install" ]]; then
-        echo_summary "Installing Magnetodb"
-        install_magnetodb
-    elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
-        echo_summary "Configuring Magnetodb"
-        configure_magnetodb
-        create_magnetodb_credentials
-        if is_service_enabled tempest; then
-            configure_magnetodb_tempest_plugin
-        fi
-    elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
-        echo_summary "Starting Magnetodb"
-        start_magnetodb
-    fi
-
-    if [[ "$1" == "unstack" ]]; then
-        echo "Stopping MagnetoDB"
-        stop_magnetodb
-        echo "Cleaning MagnetoDB data"
-        clean_magnetodb
-    fi
-
-    if [[ "$1" == "clean" ]]; then
-        echo "Cleaning Magnetodb"
-        clean_magnetodb
-    fi
-fi

deployment/magnetodb_install.sh

@@ -21,7 +21,7 @@ CassandraClusterAmountNodes="3"
 KEYSPACE_TenantName="default_tenant"
 KEYSPACE_ReplicationFactor="3"
 CCMURL="https://github.com/pcmanus/ccm"
-MagnetodbURL="https://github.com/stackforge/magnetodb.git"
+MagnetodbURL="https://git.openstack.org/stackforge/magnetodb.git"
 UserName=stack
 UserGroup=stack
 

devstack/README.rst

@@ -2,19 +2,16 @@ This directory contains the files necessary to integrate Magnetodb with devstack
 
 To install::
 
-    $ DEVSTACK_DIR=.../path/to/devstack
-    $ cp lib/magnetodb ${DEVSTACK_DIR}/lib
-    $ cp extras.d/90-magnetodb.sh ${DEVSTACK_DIR}/extras.d
-
-To configure devstack to run Magnetodb::
-
-    $ cd ${DEVSTACK_DIR}
-    $ echo "enable_service magnetodb" >> local.conf
+    $ echo "enable_plugin magnetodb https://git.openstack.org/stackforge/magnetodb" >> local.conf
 
 To have an ability to run functional tests::
 
     $ echo "enable_service tempest" >> local.conf
 
+To install magnetodb and keystone only in addition to first step::
+
+    $ echo "ENABLED_SERVICES=key,mysql,rabbit" >> local.conf
+
 Also for disabling Cassandra backend and install only Magnetodb::
 
     $ echo "MAGNETODB_BACKEND=none" >> local.conf

devstack/plugin.sh

@@ -462,6 +462,35 @@ function clean_magnetodb() {
 # Restore xtrace
 $XTRACE
 
-# Local variables:
-# mode: shell-script
-# End:
+# Dispatcher
+if is_service_enabled magnetodb; then
+    if [[ "$1" == "source" ]]; then
+        # Initial source
+        source $TOP_DIR/lib/magnetodb
+    elif [[ "$1" == "stack" && "$2" == "install" ]]; then
+        echo_summary "Installing Magnetodb"
+        install_magnetodb
+    elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
+        echo_summary "Configuring Magnetodb"
+        configure_magnetodb
+        create_magnetodb_credentials
+        if is_service_enabled tempest; then
+            configure_magnetodb_tempest_plugin
+        fi
+    elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
+        echo_summary "Starting Magnetodb"
+        start_magnetodb
+    fi
+
+    if [[ "$1" == "unstack" ]]; then
+        echo "Stopping MagnetoDB"
+        stop_magnetodb
+        echo "Cleaning MagnetoDB data"
+        clean_magnetodb
+    fi
+
+    if [[ "$1" == "clean" ]]; then
+        echo "Cleaning Magnetodb"
+        clean_magnetodb
+    fi
+fi

devstack/settings

@@ -0,0 +1 @@
+enable_service magnetodb

doc/source/admin_guide.rst

@@ -141,7 +141,7 @@ Installing MagnetoDB::
     sudo mkdir -p /opt/magnetodb
     sudo chown -R magneto:magneto /opt/magnetodb
 
-    git clone https://github.com/stackforge/magnetodb.git /opt/magnetodb
+    git clone https://git.openstack.org/stackforge/magnetodb.git /opt/magnetodb
     cd /opt/magnetodb
     sudo pip2.7 install -r requirements.txt -r test-requirements.txt
 

doc/source/developer_guide.rst

@@ -43,7 +43,7 @@ Getting the code
 
 Grab the code from GitHub::
 
-$ git clone https://github.com/stackforge/magnetodb.git
+$ git clone https://git.openstack.org/stackforge/magnetodb.git
 $ cd magnetodb
 
 

functionaltests/pre_test_hook.sh

@@ -16,10 +16,6 @@
 
 # Install magnetodb devstack integration
 DEST_DIR=/opt/stack/new
-MAGNETODB_BASE=$DEST_DIR/magnetodb/contrib/devstack
-DEVSTACK_BASE=$DEST_DIR/devstack
 DEVSTACK_GATE=$DEST_DIR/devstack-gate
 
-cp $MAGNETODB_BASE/lib/* $DEVSTACK_BASE/lib
-cp $MAGNETODB_BASE/extras.d/* $DEVSTACK_BASE/extras.d
 sed -e 's/ERROR_ON_CLONE=True/ERROR_ON_CLONE=False/' -i $DEVSTACK_GATE/devstack-vm-gate.sh