Browse Source

Fix configutilities and controllerconfig installs in DevStack

Use the DevStack-provided functions to do the Python installations
for configutilities and controllerconfig.

Prepare the plugin setting for declaring DevStack prereqs that
is available in master's DevStack playbook.

Also do not enable all services by default. sysinv-api is disabled
in the devstack job as it does not properly start under Bionic.  We
will address this separately.

Change-Id: Ib57863526d285049b5964828e1b60bf215d25a23
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
Dean Troyer 2 months ago
parent
commit
cf23446094
3 changed files with 17 additions and 9 deletions
  1. 2
    1
      .zuul.yaml
  2. 8
    6
      devstack/lib/stx-config
  3. 7
    2
      devstack/settings

+ 2
- 1
.zuul.yaml View File

@@ -180,7 +180,8 @@
180 180
         # fm-rest-api: true
181 181
         # fm-mgr: true
182 182
         sysinv-agent: true
183
-        sysinv-api: true
183
+        # Skip sysinv-api for now, needs more attention
184
+        # sysinv-api: true
184 185
         sysinv-cond: true
185 186
         mysql: false
186 187
         postgresql: true

+ 8
- 6
devstack/lib/stx-config View File

@@ -162,15 +162,17 @@ function install_cgtsclient {
162 162
 }
163 163
 
164 164
 function install_configutilities {
165
-    pushd $STXCONFIG_CONFUTILS
166
-    sudo python setup.py install --root=/ --install-lib=$PYTHON_SITE_DIR --prefix=/usr --install-data=/usr/share --single-version-externally-managed
167
-    popd
165
+    # We can't use setup_develop as there is no setup.cfg file present for configutilities
166
+    setup_package $STXCONFIG_CONFUTILS -e
168 167
 }
169 168
 
170 169
 function install_controllerconfig {
171
-    pushd $STXCONFIG_CONTROL
172
-    sudo python setup.py install --root=/ --install-lib=$PYTHON_SITE_DIR --prefix=/usr --install-data=/usr/share --single-version-externally-managed
173
-    popd
170
+    # This is a hack to work around the lack of proper global-requirements
171
+    # setup in these packages
172
+    pip_install pycrypto
173
+
174
+    # We can't use setup_develop as there is no setup.cfg file present for controllerconfig
175
+    setup_package $STXCONFIG_CONTROL -e
174 176
 }
175 177
 
176 178
 function install_sysinv {

+ 7
- 2
devstack/settings View File

@@ -7,8 +7,13 @@
7 7
 STX_CONFIG_NAME=stx-config
8 8
 
9 9
 ######### Plugin Specific ##########
10
-enable_service $STX_CONFIG_NAME sysinv sysinv-api sysinv-cond
11
-#define_plugin sysinv
10
+enable_service $STX_CONFIG_NAME
11
+
12
+# This must not use any variables to work properly in OpenStack's DevStack playbook
13
+define_plugin stx-config
14
+# This works for Zuul jobs using OpenStack's DevStack roles
15
+plugin_requires stx-config stx-integ
16
+plugin_requires stx-config stx-update
12 17
 
13 18
 # Handle STX pre-reqs
14 19
 # stx-integ

Loading…
Cancel
Save