commit bc84cdf4877bf61c5b684dc01e4ef9b77bb3e4be
author Jenkins <jenkins@review.openstack.org> Sat Jul 27 15:57:35 2013 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jul 27 15:57:35 2013 +0000
tree c2dd6d286cc642dc60fe8b6c569a7ed612979461
parent fa6d0c06cc23d92580d76a987dfdd45c4cca8e99
parent 75195b58cc27bf415594235e1e36ec7cd8223321

Merge "ensure all horizon needed clients are installed from git"

lib/neutron_plugins/services/loadbalancer

diff --git a/lib/neutron_plugins/services/loadbalancer b/lib/neutron_plugins/services/loadbalancer
index 49e286a..c38f904 100644
--- a/lib/neutron_plugins/services/loadbalancer
+++ b/lib/neutron_plugins/services/loadbalancer
@@ -34,7 +34,6 @@
 
     cp $NEUTRON_DIR/etc/lbaas_agent.ini $LBAAS_AGENT_CONF_FILENAME
 
-    iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT use_namespaces $Q_USE_NAMESPACE
     # ovs_use_veth needs to be set before the plugin configuration
     # occurs to allow plugins to override the setting.
     iniset $LBAAS_AGENT_CONF_FILENAME DEFAULT ovs_use_veth $Q_OVS_USE_VETH

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index b4a579b..3831c28 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -251,10 +251,6 @@
     # Compute admin
     iniset $TEMPEST_CONF "compute-admin" password "$password" # DEPRECATED
 
-    # Network
-    if is_service_enabled neutron; then
-        iniset $TEMPEST_CONF service_available neutron "True"
-    fi
     iniset $TEMPEST_CONF network api_version 2.0
     iniset $TEMPEST_CONF network tenant_networks_reachable "$tenant_networks_reachable"
     iniset $TEMPEST_CONF network public_network_id "$public_network_id"
@@ -268,11 +264,6 @@
     iniset $TEMPEST_CONF boto http_socket_timeout 30
     iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
 
-    # Orchestration
-    if is_service_enabled heat; then
-        iniset $TEMPEST_CONF orchestration heat_available "True"
-    fi
-
     # Scenario
     iniset $TEMPEST_CONF scenario img_dir "$FILES/images/cirros-0.3.1-x86_64-uec"
 
@@ -287,6 +278,15 @@
     # cli
     iniset $TEMPEST_CONF cli cli_dir $NOVA_BIN_DIR
 
+    # service_available
+    for service in nova cinder glance neutron swift heat ; do
+        if is_service_enabled $service ; then
+            iniset $TEMPEST_CONF service_available $service "True"
+        else
+            iniset $TEMPEST_CONF service_available $service "False"
+        fi
+    done
+
     echo "Created tempest configuration file:"
     cat $TEMPEST_CONF
 

stack.sh

diff --git a/stack.sh b/stack.sh
index 455ccd1..4e23505 100755
--- a/stack.sh
+++ b/stack.sh
@@ -739,6 +739,9 @@
 if is_service_enabled ceilometer; then
     install_ceilometerclient
     install_ceilometer
+    echo_summary "Configuring Ceilometer"
+    configure_ceilometer
+    configure_ceilometerclient
 fi
 
 if is_service_enabled heat; then
@@ -1081,10 +1084,10 @@
         echo_summary "Using VMware vCenter driver"
         iniset $NOVA_CONF DEFAULT compute_driver "vmwareapi.VMwareVCDriver"
         VMWAREAPI_USER=${VMWAREAPI_USER:-"root"}
-        iniset $NOVA_CONF DEFAULT vmwareapi_host_ip "$VMWAREAPI_IP"
-        iniset $NOVA_CONF DEFAULT vmwareapi_host_username "$VMWAREAPI_USER"
-        iniset $NOVA_CONF DEFAULT vmwareapi_host_password "$VMWAREAPI_PASSWORD"
-        iniset $NOVA_CONF DEFAULT vmwareapi_cluster_name "$VMWAREAPI_CLUSTER"
+        iniset $NOVA_CONF vmware host_ip "$VMWAREAPI_IP"
+        iniset $NOVA_CONF vmware host_username "$VMWAREAPI_USER"
+        iniset $NOVA_CONF vmware host_password "$VMWAREAPI_PASSWORD"
+        iniset $NOVA_CONF vmware cluster_name "$VMWAREAPI_CLUSTER"
         if is_service_enabled neutron; then
             iniset $NOVA_CONF vmware integration_bridge $OVS_BRIDGE
         fi
@@ -1212,9 +1215,6 @@
     start_cinder
 fi
 if is_service_enabled ceilometer; then
-    echo_summary "Configuring Ceilometer"
-    configure_ceilometer
-    configure_ceilometerclient
     echo_summary "Starting Ceilometer"
     init_ceilometer
     start_ceilometer