X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Ftools%2Fodl-openstack-integration%2Fpuppet%2Ftemplates%2Fcompute.local.conf.erb;fp=test%2Ftools%2Fodl-openstack-integration%2Fpuppet%2Ftemplates%2Fcompute.local.conf.erb;h=0000000000000000000000000000000000000000;hb=59e81c38620fa1b61e15771191e35771450b9499;hp=f99956ef39d9a10bf4658fab146e1c71f32567ff;hpb=072f6e3a8d1bdf8f4c663843589c22d93ba07791;p=integration%2Ftest.git diff --git a/test/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb b/test/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb deleted file mode 100644 index f99956ef39..0000000000 --- a/test/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb +++ /dev/null @@ -1,55 +0,0 @@ -[[local|localrc]] -SCREEN_LOGDIR=/opt/stack/log -LOGFILE=stack.sh.log -LOG_COLOR=False -#OFFLINE=True -#RECLONE=yes - -HOST_IP=<%= @hosts[@hostname]['ipaddress'] %> -HOST_NAME=<%= @hosts[@hostname]['name'] %> -SERVICE_HOST=<%= @hosts['ds-ctl']['name'] %> -SERVICE_HOST_NAME=<%= @hosts['ds-ctl']['name'] %> - -Q_HOST=$SERVICE_HOST -MYSQL_HOST=$SERVICE_HOST -RABBIT_HOST=$SERVICE_HOST -GLANCE_HOSTPORT=$SERVICE_HOST:9292 -KEYSTONE_AUTH_HOST=$SERVICE_HOST -KEYSTONE_SERVICE_HOST=$SERVICE_HOST - -MYSQL_PASSWORD=mysql -RABBIT_PASSWORD=rabbit -QPID_PASSWORD=rabbit -SERVICE_TOKEN=service -SERVICE_PASSWORD=admin -ADMIN_PASSWORD=admin - -VNCSERVER_PROXYCLIENT_ADDRESS=$HOST_IP -VNCSERVER_LISTEN=0.0.0.0 - -disable_all_services -enable_service neutron quantum nova n-cpu n-novnc rabbit odl-compute - -# ODL WITH ML2 -Q_PLUGIN=ml2 -Q_ML2_PLUGIN_MECHANISM_DRIVERS=opendaylight,logger -ODL_MGR_IP=<%= @hosts['opendaylight']['ipaddress'] %> - -ENABLE_TENANT_TUNNELS=True -# Q_ML2_TENANT_NETWORK_TYPE=vlan -# ENABLE_TENANT_VLANS=True -Q_ML2_TENANT_NETWORK_TYPE=vxlan -#Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=vxlan) - -#FLOATING_RANGE=192.168.254.64/26 - -EXTRA_OPTS=(scheduler_default_filters=AllHostsFilter) - -[[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]] -[agent] -minimize_polling=True - -[ml2_odl] -url=http://<%= @hosts['opendaylight']['ipaddress'] %>:8080/controller/nb/v2/neutron -username=admin -password=admin