Icehouse commit. Nothing to see here yet

ceilometer-compute.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -x
 
 # ceilometer-compute.sh
 

ceilometer.sh

@@ -12,15 +12,6 @@ sudo apt-get -y install ceilometer-api ceilometer-collector ceilometer-agent-cen
 
 sudo service mongodb restart
 
-# Ceilometer uses MongoDB
-
-echo 'db.addUser( { user: "ceilometer",
-              pwd: "openstack",
-              roles: [ "readWrite", "dbAdmin" ]
-            } );' | tee -a /tmp/ceilometer.js
-
-mongo ceilometer /tmp/ceilometer.js
-
 # Configure Ceilometer
 # /etc/ceilometer/ceilometer.conf
 sudo sed -i "s/^#backend.*/backend=mongodb/g" /etc/ceilometer/ceilometer.conf
@@ -48,12 +39,25 @@ METERING_SERVICE_ID=$(keystone service-list | awk '/\ metering\ / {print $2}')
 
 keystone endpoint-create \
   --service-id=${METERING_SERVICE_ID} \
-  --publicurl=http://${CONTROLLER_HOST}:8777/ \
-  --internalurl=http://${CONTROLLER_HOST}:8777/ \
-  --adminurl=http://${CONTROLLER_HOST}:8777/
+  --publicurl=http://${CONTROLLER_HOST}:8777 \
+  --internalurl=http://${CONTROLLER_HOST}:8777 \
+  --adminurl=http://${CONTROLLER_HOST}:8777
+
+# Ceilometer uses MongoDB
+
+echo 'db.addUser( { user: "ceilometer",
+              pwd: "openstack",
+              roles: [ "readWrite", "dbAdmin" ]
+            } );' | tee -a /tmp/ceilometer.js
+
+mongo ceilometer /tmp/ceilometer.js
+
+service mongodb restart
+
+sleep 2
 
 service ceilometer-agent-central restart
 sleep 1
-service ceilometer-api restart
-sleep 1
 service ceilometer-collector restart
+sleep 1
+service ceilometer-api restart

heat.sh

@@ -38,17 +38,17 @@ ORCHESTRATION_SERVICE_ID=$(keystone service-list | awk '/\ orchestration\ / {pri
 
 keystone endpoint-create \
   --service-id=${ORCHESTRATION_SERVICE_ID} \
-  --publicurl=http://${CONTROLLER_HOST}:8004/v1/%\(tenant_id\)s \
-  --internalurl=http://${CONTROLLER_HOST}:8004/v1/%\(tenant_id\)s \
-  --adminurl=http://${CONTROLLER_HOST}:8004/v1/%\(tenant_id\)s
+  --publicurl=http://${CONTROLLER_HOST}:8004/v1/$\(tenant_id\)s \
+  --internalurl=http://${CONTROLLER_HOST}:8004/v1/$\(tenant_id\)s \
+  --adminurl=http://${CONTROLLER_HOST}:8004/v1/$\(tenant_id\)s
 
 keystone service-create --name=heat-cfn --type=cloudformation --description="Heat CloudFormation API"
 
 CLOUDFORMATION_SERVICE_ID=$(keystone service-list | awk '/\ cloudformation\ / {print $2}')
 
 keystone endpoint-create \
   --service-id=${CLOUDFORMATION_SERVICE_ID} \
-  --publicurl=http://${CONTROLLER_HOST}:8000/v1 \
+  --publicurl=http://${CONTROLLER_HOST}:8000/v1/ \
   --internalurl=http://${CONTROLLER_HOST}:8000/v1 \
   --adminurl=http://${CONTROLLER_HOST}:8000/v1
 

openrc

@@ -0,0 +1,4 @@
+export OS_TENANT_NAME=cookbook
+export OS_USERNAME=admin
+export OS_PASSWORD=openstack
+export OS_AUTH_URL=http://172.16.0.200:5000/v2.0/