Merge pull request #16 from noelbk/contrail

Fix nova 401 and redis

Author: Deepinder Setia

contrail/localrc-multinode-compute

@@ -1,5 +1,12 @@
+HOST_IP=172.18.4.10 # publicly routable ip to me
+
 # change this to your master node's ip
-SERVICE_HOST=172.18.3.6 
+SERVICE_HOST=172.18.4.18 # contrail0
+
+# allow floating ips from 172.18.4.240 to 172.18.4.255
+CONTRAIL_VGW_INTERFACE=vgw
+CONTRAIL_VGW_PUBLIC_SUBNET=172.18.4.240/28 # .240 to .255
+CONTRAIL_VGW_PUBLIC_NETWORK=default-domain:admin:public:public
 
 # the interface that contrail's vhost0 should take over
 PHYSICAL_INTERFACE=eth0

contrail/localrc-multinode-server

@@ -1,4 +1,10 @@
 # CONTRAIL MULTI_NODE master
+HOST_IP=192.168.122.251
+
+# allow floating ips from 192.168.122.240 to 192.168.122.255
+CONTRAIL_VGW_INTERFACE=vgw
+CONTRAIL_VGW_PUBLIC_SUBNET=192.168.122.240/28 # .240 to .255
+CONTRAIL_VGW_PUBLIC_NETWORK=default-domain:admin:public:public
 
 ENABLE_CONTRAIL=yes
 PHYSICAL_INTERFACE=eth0
@@ -8,19 +14,23 @@ Q_PLUGIN=contrail
 
 STACK_DIR=$(cd $(dirname $0) && pwd)
 
+# log all screen output to this directory
+SCREEN_LOGDIR=$STACK_DIR/log/screens
 LOG=True
 DEBUG=True
 LOGFILE=$STACK_DIR/log/stack.log
 LOGDAYS=1
 
 disable_service n-net
 enable_service q-svc
-enable_service q-agt
 enable_service q-dhcp
-enable_service q-l3
 enable_service q-meta
 enable_service neutron
 enable_service rabbit
+
+# not used by contrail
+disable_service q-l3
+disable_service q-agt
 enable_service contrail
 
 DATABASE_PASSWORD=contrail123

contrail/redis.conf.patch

@@ -0,0 +1,21 @@
+--- /etc/redis/redis.conf	2011-07-27 17:26:50.000000000 +0000
++++ redis.conf	2013-11-19 19:28:06.266187000 +0000
+@@ -14,7 +14,7 @@
+ 
+ # By default Redis does not run as a daemon. Use 'yes' if you need it.
+ # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+-daemonize yes
++#daemonize yes
+ 
+ # When running daemonized, Redis writes a pid file in /var/run/redis.pid by
+ # default. You can specify a custom pid file location here.
+@@ -22,7 +22,8 @@
+ 
+ # Accept connections on the specified port, default is 6379.
+ # If port 0 is specified Redis will not listen on a TCP socket.
+-port 6379
++# contrail uses redis on 6382
++port 6382
+ 
+ # If you want you can bind a single interface, if the bind option is not
+ # specified all the interfaces will listen for incoming connections.

functions

@@ -63,7 +63,7 @@ function apt_get() {
     $sudo DEBIAN_FRONTEND=noninteractive \
         http_proxy=$http_proxy https_proxy=$https_proxy \
         no_proxy=$no_proxy \
-        apt-get --option "Dpkg::Options::=--force-confold" --assume-yes "$@"
+        apt-get --option "Dpkg::Options::=--force-confold" --force-yes --assume-yes "$@"
 }
 
 

lib/keystone

@@ -333,6 +333,18 @@ function init_keystone() {
         sudo chown $STACK_USER $KEYSTONE_AUTH_CACHE_DIR
         rm -f $KEYSTONE_AUTH_CACHE_DIR/*
     fi
+
+    # Nova always speaks HTTPS, so keystone needs SSL certs
+    if [ ${KEYSTONE_SERVICE_PROTOCOL} == 'https' ]; then
+	$KEYSTONE_DIR/bin/keystone-manage ssl_setup
+	iniset $KEYSTONE_CONF ssl enable True
+	iniset $KEYSTONE_CONF ssl certfile ${KEYSTONE_CONF_DIR}/ssl/certs/keystone.pem
+	iniset $KEYSTONE_CONF ssl keyfile ${KEYSTONE_CONF_DIR}/ssl/private/keystonekey.pem
+	iniset $KEYSTONE_CONF ssl ca_certs ${KEYSTONE_CONF_DIR}/ssl/certs/ca.pem
+	iniset $KEYSTONE_CONF ssl ca_key ${KEYSTONE_CONF_DIR}/ssl/private/cakey.pem
+    else
+	iniset $KEYSTONE_CONF ssl enable False
+    fi
 }
 
 # install_keystoneclient() - Collect source and prepare
@@ -372,7 +384,7 @@ function start_keystone() {
     fi
 
     echo "Waiting for keystone to start..."
-    if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= curl -s http://$SERVICE_HOST:$service_port/v$IDENTITY_API_VERSION/ >/dev/null; do sleep 1; done"; then
+    if ! timeout $SERVICE_TIMEOUT sh -c "while ! http_proxy= curl -k -s ${KEYSTONE_SERVICE_PROTOCOL}://$SERVICE_HOST:$service_port/v$IDENTITY_API_VERSION/ >/dev/null; do sleep 1; done"; then
       die $LINENO "keystone did not start"
     fi
 

lib/neutron_thirdparty/contrail

@@ -282,8 +282,17 @@ function start_contrail() {
     # Set a reasonable status bar
     screen -r $SCREEN_NAME -X hardstatus alwayslastline "$SCREEN_HARDSTATUS"
 
+    # redis: rebuild /etc/contrail/redis.conf to listen on port 6382
+    rm -f /etc/contrail/redis.conf
+    for f in /etc/redis.conf /etc/redis/redis.conf; do
+	if [ -e $f ]; then
+	    cp -f $f /etc/contrail/redis.conf 
+	fi
+    done 
+    patch -p0 -N -r - -d /etc/contrail < $TOP_DIR/contrail/redis.conf.patch
+
     # launch ...
-    screen_it redis "sudo redis-server /etc/redis.conf"
+    screen_it redis "sudo redis-server /etc/contrail/redis.conf"
     screen_it cass "sudo /usr/sbin/cassandra -f"
     screen_it zk  "cd $CONTRAIL_SRC/third_party/zookeeper-3.4.5; ./bin/zkServer.sh start"
     screen_it ifmap "cd $CONTRAIL_SRC/third_party/irond-0.3.0-bin; java -jar ./irond.jar"

lib/nova

@@ -566,6 +566,22 @@ function create_nova_conf() {
     iniset $NOVA_CONF DEFAULT ec2_dmz_host "$EC2_DMZ_HOST"
     iniset_rpc_backend nova $NOVA_CONF DEFAULT
     iniset $NOVA_CONF DEFAULT glance_api_servers "$GLANCE_HOSTPORT"
+
+    # [keystone_authtoken]
+    # Host providing the admin Identity API endpoint
+    iniset $NOVA_CONF keystone_authtoken auth_host $KEYSTONE_SERVICE_HOST
+    # Port of the admin Identity API endpoint
+    iniset $NOVA_CONF keystone_authtoken auth_port $KEYSTONE_SERVICE_PORT
+    # Protocol of the admin Identity API endpoint
+    iniset $NOVA_CONF keystone_authtoken auth_protocol $KEYSTONE_SERVICE_PROTOCOL
+    # Keystone service account tenant name to validate user tokens
+    iniset $NOVA_CONF keystone_authtoken admin_tenant_name $SERVICE_TENANT_NAME
+    # Keystone account username
+    iniset $NOVA_CONF keystone_authtoken admin_user nova
+    # Keystone account password
+    iniset $NOVA_CONF keystone_authtoken admin_password $ADMIN_PASSWORD
+    iniset $NOVA_CONF keystone_authtoken auth_version v2.0
+
 }
 
 function init_nova_cells() {