x/tatu
Code Issues Proposed changes

Tatu should be last plugin in local.conf; write vendordata config to NOVA_CONF, not NOVA_CPU_CONF.

Browse Source 
Change-Id: Iba80bc8452bf9726b7b861eaec2ac25d85e4e93e
Signed-off-by: Pino de Candia <giuseppe.decandia@gmail.com>
This commit is contained in:
Pino de Candia 2018-03-08 21:37:04 +00:00
parent 5a2e575a56
commit fe3e41f34e
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/local-df.conf
View File

@ -6,10 +6,12 @@ SERVICE_PASSWORD=pinot
SERVICE_TOKEN=pinot
ADMIN_PASSWORD=pinot
enable_plugin tatu https://git.openstack.org/openstack/tatu
enable_plugin designate https://git.openstack.org/openstack/designate
enable_plugin barbican https://git.openstack.org/openstack/barbican
enable_plugin dragonflow https://github.com/pinodeca/dragonflow tatu
# List tatu after barbican, designate, and dragonflow - tatu's startup depends on theirs
enable_plugin tatu https://git.openstack.org/openstack/tatu
enable_service df-redis
enable_service df-redis-server
enable_service df-controller

3
devstack/local.conf
View File

@ -6,9 +6,10 @@ SERVICE_PASSWORD=pinot
SERVICE_TOKEN=pinot
ADMIN_PASSWORD=pinot
enable_plugin tatu https://git.openstack.org/openstack/tatu
enable_plugin designate https://git.openstack.org/openstack/designate
enable_plugin barbican https://git.openstack.org/openstack/barbican
# List tatu after barbican and designate - tatu's startup depends on theirs
enable_plugin tatu https://git.openstack.org/openstack/tatu
Q_USE_PROVIDERNET_FOR_PUBLIC=True
Q_FLOATING_ALLOCATION_POOL=start=172.24.4.10,end=172.24.4.200

24
devstack/plugin.sh
View File

@ -57,21 +57,21 @@ function configure_tatu {
iniset $KEYSTONE_CONF oslo_messaging_notifications topics notifications,tatu_notifications
iniset $NOVA_CONF oslo_messaging_notifications topics notifications,tatu_notifications
iniset $NOVA_CPU_CONF DEFAULT force_config_drive TRUE
iniset $NOVA_CONF DEFAULT force_config_drive TRUE
# Set up Tatu static vendor data.
$TATU_DIR/scripts/cloud-config-to-vendor-data $TATU_DIR/files/user-cloud-config > $NOVA_CONF_DIR/tatu_static_vd.json
iniset $NOVA_CPU_CONF api vendordata_providers StaticJSON,DynamicJSON
iniset $NOVA_CPU_CONF api vendordata_jsonfile_path $NOVA_CONF_DIR/tatu_static_vd.json
iniset $NOVA_CPU_CONF api vendordata_dynamic_targets tatu@$TATU_SERVICE_PROTOCOL://$TATU_SERVICE_HOST:$TATU_SERVICE_PORT/novavendordata
iniset $NOVA_CPU_CONF api vendordata_dynamic_connect_timeout 5
iniset $NOVA_CPU_CONF api vendordata_dynamic_read_timeout 30
iniset $NOVA_CPU_CONF vendordata_dynamic_auth auth_url $KEYSTONE_SERVICE_URI
iniset $NOVA_CPU_CONF vendordata_dynamic_auth auth_type password
iniset $NOVA_CPU_CONF vendordata_dynamic_auth username admin
iniset $NOVA_CPU_CONF vendordata_dynamic_auth password $ADMIN_PASSWORD
iniset $NOVA_CPU_CONF vendordata_dynamic_auth project_id $admin_project
iniset $NOVA_CPU_CONF vendordata_dynamic_auth user_domain_name default
iniset $NOVA_CONF api vendordata_providers StaticJSON,DynamicJSON
iniset $NOVA_CONF api vendordata_jsonfile_path $NOVA_CONF_DIR/tatu_static_vd.json
iniset $NOVA_CONF api vendordata_dynamic_targets tatu@$TATU_SERVICE_PROTOCOL://$TATU_SERVICE_HOST:$TATU_SERVICE_PORT/novavendordata
iniset $NOVA_CONF api vendordata_dynamic_connect_timeout 5
iniset $NOVA_CONF api vendordata_dynamic_read_timeout 30
iniset $NOVA_CONF vendordata_dynamic_auth auth_url $KEYSTONE_SERVICE_URI
iniset $NOVA_CONF vendordata_dynamic_auth auth_type password
iniset $NOVA_CONF vendordata_dynamic_auth username admin
iniset $NOVA_CONF vendordata_dynamic_auth password $ADMIN_PASSWORD
iniset $NOVA_CONF vendordata_dynamic_auth project_id $admin_project
iniset $NOVA_CONF vendordata_dynamic_auth user_domain_name default
# General Configuration
iniset_rpc_backend tatu $TATU_CONF DEFAULT