summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devstack/devstackgaterc2
-rw-r--r--devstack/lib/networking-ovn60
-rw-r--r--devstack/local.conf.sample6
-rw-r--r--devstack/ovn-octavia-provider.conf.sample4
-rw-r--r--devstack/plugin.sh16
5 files changed, 6 insertions, 82 deletions
diff --git a/devstack/devstackgaterc b/devstack/devstackgaterc
index 99d5d24..3eab2d6 100644
--- a/devstack/devstackgaterc
+++ b/devstack/devstackgaterc
@@ -20,7 +20,7 @@
20 20
21OVN_OPTS=$@ 21OVN_OPTS=$@
22 22
23OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,n-api-meta,placement-api,g-api,g-reg,c-sch,c-api,c-vol,rabbit,mysql,dstat,ovn-northd,ovn-controller,q-svc,networking-ovn-metadata-agent,br-ex-tcpdump,br-int-flows,q-trunk,ovn-octavia,o-api,o-hk 23OVERRIDE_ENABLED_SERVICES=key,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj,n-api-meta,placement-api,g-api,g-reg,c-sch,c-api,c-vol,rabbit,mysql,dstat,ovn-northd,ovn-controller,q-svc,networking-ovn-metadata-agent,br-ex-tcpdump,br-int-flows,q-trunk,octavia,o-api,o-hk
24export OVERRIDE_ENABLED_SERVICES 24export OVERRIDE_ENABLED_SERVICES
25 25
26if [ -z "${RALLY_SCENARIO}" ] ; then 26if [ -z "${RALLY_SCENARIO}" ] ; then
diff --git a/devstack/lib/networking-ovn b/devstack/lib/networking-ovn
index c8342c1..e6bac69 100644
--- a/devstack/lib/networking-ovn
+++ b/devstack/lib/networking-ovn
@@ -102,9 +102,6 @@ NEUTRON_DIR=$DEST/neutron
102 102
103OVN_META_CONF=$NEUTRON_CONF_DIR/networking_ovn_metadata_agent.ini 103OVN_META_CONF=$NEUTRON_CONF_DIR/networking_ovn_metadata_agent.ini
104 104
105# Octavia directory
106OCTAVIA_DIR=$DEST/octavia
107
108# Set variables for building OVS from source 105# Set variables for building OVS from source
109OVS_REPO=$OVN_REPO 106OVS_REPO=$OVN_REPO
110OVS_REPO_NAME=$OVN_REPO_NAME 107OVS_REPO_NAME=$OVN_REPO_NAME
@@ -566,63 +563,6 @@ function create_public_bridge {
566 sudo ip link set $ext_gw_ifc up 563 sudo ip link set $ext_gw_ifc up
567} 564}
568 565
569function _start_ovn_octavia_apache_wsgi {
570 if [[ "$WSGI_MODE" == "uwsgi" ]]; then
571 run_process $OCTAVIA_API "$OCTAVIA_BIN_DIR/uwsgi --ini $OCTAVIA_UWSGI_CONF"
572 enable_apache_site octavia-wsgi
573 else
574 enable_apache_site octavia
575 restart_apache_server
576 fi
577}
578
579function _stop_ovn_octavia_apache_wsgi {
580 if [[ "$WSGI_MODE" == "uwsgi" ]]; then
581 disable_apache_site octavia-wsgi
582 stop_process $OCTAVIA_API
583 else
584 disable_apache_site octavia
585 restart_apache_server
586 fi
587}
588
589function install_ovn_octavia {
590 source $OCTAVIA_DIR/devstack/plugin.sh
591 octavia_install
592 octaviaclient_install
593}
594
595function configure_ovn_octavia {
596 source $OCTAVIA_DIR/devstack/plugin.sh
597 octavia_configure
598 iniset $OCTAVIA_CONF api_settings enabled_provider_drivers 'ovn:OVN provider driver'
599 iniset $OCTAVIA_CONF api_settings default_provider_driver 'ovn'
600 iniset $OCTAVIA_CONF house_keeping load_balancer_expiry_age 20
601}
602
603function start_ovn_octavia {
604 source $OCTAVIA_DIR/devstack/plugin.sh
605 source $OCTAVIA_DIR/devstack/settings
606 create_octavia_accounts
607 add_load-balancer_roles
608 if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then
609 _start_ovn_octavia_apache_wsgi
610 else
611 run_process $OCTAVIA_API "$OCTAVIA_API_BINARY $OCTAVIA_API_ARGS"
612 fi
613 run_process $OCTAVIA_HOUSEKEEPER "$OCTAVIA_HOUSEKEEPER_BINARY $OCTAVIA_HOUSEKEEPER_ARGS"
614}
615
616function stop_ovn_octavia {
617 source $OCTAVIA_DIR/devstack/plugin.sh
618 source $OCTAVIA_DIR/devstack/settings
619 if [[ "$OCTAVIA_USE_MOD_WSGI" == "True" ]]; then
620 _stop_ovn_octavia_apache_wsgi
621 else
622 stop_process $OCTAVIA_API
623 fi
624 stop_process $OCTAVIA_HOUSEKEEPER
625}
626 566
627# Restore xtrace 567# Restore xtrace
628$_XTRACE_NETWORKING_OVN 568$_XTRACE_NETWORKING_OVN
diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index cb6ed37..ba47b15 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -92,13 +92,13 @@ disable_service cinder c-sch c-api c-vol
92# amphore driver. If you want to enable Octavia amphore driver, please see 92# amphore driver. If you want to enable Octavia amphore driver, please see
93# the local.conf sample in the octavia repo. 93# the local.conf sample in the octavia repo.
94enable_plugin octavia https://git.openstack.org/openstack/octavia 94enable_plugin octavia https://git.openstack.org/openstack/octavia
95LIBS_FROM_GIT+=python-octaviaclient 95enable_service octavia
96enable_service ovn-octavia
97enable_service o-api 96enable_service o-api
98enable_service o-hk 97enable_service o-hk
99disable_service o-cw 98disable_service o-cw
100disable_service o-hm 99disable_service o-hm
101enable_plugin octavia-tempest-plugin https://git.openstack.org/openstack/octavia-tempest-plugin 100DISABLE_AMP_IMAGE_BUILD=True
101LIBS_FROM_GIT+=python-octaviaclient
102 102
103# If you want to enable a provider network instead of the default private 103# If you want to enable a provider network instead of the default private
104# network after your DevStack environment installation, you *must* set 104# network after your DevStack environment installation, you *must* set
diff --git a/devstack/ovn-octavia-provider.conf.sample b/devstack/ovn-octavia-provider.conf.sample
index b4ad5d2..02919fc 100644
--- a/devstack/ovn-octavia-provider.conf.sample
+++ b/devstack/ovn-octavia-provider.conf.sample
@@ -11,7 +11,7 @@ RABBIT_PASSWORD=password
11SERVICE_PASSWORD=password 11SERVICE_PASSWORD=password
12SERVICE_TOKEN=password 12SERVICE_TOKEN=password
13ADMIN_PASSWORD=password 13ADMIN_PASSWORD=password
14enable_plugin networking-ovn \ $GIT_BASE/openstack/networking-ovn 14enable_plugin networking-ovn $GIT_BASE/openstack/networking-ovn
15enable_service ovn-northd 15enable_service ovn-northd
16enable_service ovn-controller 16enable_service ovn-controller
17enable_service networking-ovn-metadata-agent 17enable_service networking-ovn-metadata-agent
@@ -25,9 +25,9 @@ disable_service q-meta
25 25
26DISABLE_AMP_IMAGE_BUILD=True 26DISABLE_AMP_IMAGE_BUILD=True
27enable_plugin octavia $GIT_BASE/openstack/octavia 27enable_plugin octavia $GIT_BASE/openstack/octavia
28enable_service octavia
28enable_service o-api 29enable_service o-api
29enable_service o-hk 30enable_service o-hk
30enable_service octavia
31disable_service o-cw 31disable_service o-cw
32disable_service o-hm 32disable_service o-hm
33 33
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d16c257..cabb4a9 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -62,22 +62,6 @@ if is_service_enabled q-svc || is_service_enabled ovn-northd || is_service_enabl
62 fi 62 fi
63fi 63fi
64 64
65if is_service_enabled ovn-octavia; then
66 if [[ "$1" == "stack" && "$2" == "install" ]]; then
67 echo_summary "Installing octavia with ovn provider driver"
68 install_ovn_octavia
69 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
70 echo_summary "Configuring octavia with ovn provider driver"
71 configure_ovn_octavia
72 elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
73 start_ovn_octavia
74 fi
75
76 if [[ "$1" == "unstack" ]]; then
77 echo_summary "Uninstalling octavia with ovn provider driver"
78 stop_ovn_octavia
79 fi
80fi
81# Restore xtrace 65# Restore xtrace
82$_XTRACE_OVN_PLUGIN 66$_XTRACE_OVN_PLUGIN
83 67