diff --git a/README.rst b/README.rst index a43e0850..f57528f7 100644 --- a/README.rst +++ b/README.rst @@ -23,6 +23,7 @@ change to the following projects must pass the devstack gate test:: heat horizon quantum + ceilometer python-novaclient python-heatclient python-keystoneclient diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 377d9bab..493c9d1a 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -291,7 +291,7 @@ function cleanup_host { set +o xtrace } -PROJECTS="openstack-dev/devstack openstack-dev/grenade openstack-dev/pbr openstack/nova openstack/glance openstack/heat openstack/keystone openstack/python-novaclient openstack/python-heatclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient ${PROJECTS}" +PROJECTS="openstack-dev/devstack openstack-dev/grenade openstack-dev/pbr openstack/nova openstack/glance openstack/heat openstack/keystone openstack/python-novaclient openstack/python-heatclient openstack/python-keystoneclient openstack/python-quantumclient openstack/python-glanceclient openstack/python-openstackclient openstack/horizon openstack/quantum openstack/tempest openstack/cinder openstack/python-cinderclient openstack/swift openstack/python-swiftclient openstack/ceilometer openstack/python-ceilometerclient ${PROJECTS}" # Set this variable to skip updating the devstack-gate project itself. # Useful in development so you can edit scripts in place and run them diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 006e1687..ccb33b41 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -63,7 +63,7 @@ function setup_localrc() { MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net fi else # master - MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng + MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,s-proxy,s-account,s-container,s-object,cinder,c-api,c-vol,c-sch,n-cond,heat,h-api,h-api-cfn,h-api-cw,h-eng,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api if [ "$DEVSTACK_GATE_QUANTUM" -eq "1" ]; then MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,quantum,q-svc,q-agt,q-dhcp,q-l3,q-meta echo "Q_USE_DEBUG_COMMAND=True" >>localrc diff --git a/devstack-vm-update-image.py b/devstack-vm-update-image.py index b46ab285..e2883ab8 100755 --- a/devstack-vm-update-image.py +++ b/devstack-vm-update-image.py @@ -52,9 +52,11 @@ PROJECTS = ['openstack/nova', 'openstack/horizon', 'openstack/cinder', 'openstack/python-cinderclient', + 'openstack/ceilometer', 'openstack/swift', 'openstack/tempest', 'openstack/quantum', + 'openstack/python-ceilometerclient', 'openstack/python-glanceclient', 'openstack/python-keystoneclient', 'openstack/python-heatclient',