Use local_conf for keystone, kuryr, lvm

Use local_conf stanza where possible.

Change-Id: I0e47f06bd6cd633f2b55f9b662bc4ade8d151f1a

jenkins/jobs/keystone.yaml

@@ -51,6 +51,8 @@
           conf: |
             [[local|localrc]]
             TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
+            ENABLE_IDENTITY_V2=False
+            enable_plugin keystone git://git.openstack.org/openstack/keystone
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
@@ -62,8 +64,6 @@
           fi
 
           export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
-          export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin keystone git://git.openstack.org/openstack/keystone"
           export ENABLED_SERVICES=keystone-saml2-federation
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@@ -90,6 +90,13 @@
           conf: |
             [[local|localrc]]
             TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
+            # swift is not ready for python3 yet
+            disable_service s-account
+            disable_service s-container
+            disable_service s-object
+            disable_service s-proxy
+            ENABLE_IDENTITY_V2=False
+            enable_plugin keystone git://git.openstack.org/openstack/keystone
       - shell: |
           #!/bin/bash -xe
           export DEVSTACK_GATE_USE_PYTHON3=True
@@ -97,20 +104,12 @@
           export PROJECTS="openstack/keystone-tempest-plugin $PROJECTS"
           export DEVSTACK_GATE_TEMPEST=1
 
-          # swift is not ready for python3 yet
-          export DEVSTACK_LOCAL_CONFIG="disable_service s-account"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
-
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
           fi
 
           export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"ENABLE_IDENTITY_V2=False"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin keystone git://git.openstack.org/openstack/keystone"
           export ENABLED_SERVICES=keystone-saml2-federation
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh

jenkins/jobs/kuryr.yaml

@@ -11,6 +11,10 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
@@ -26,7 +30,6 @@
 
           export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
           export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
 
           # Keep localrc to be able to set some vars in pre_test_hook
           export KEEP_LOCALRC=1
@@ -178,6 +181,10 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
@@ -192,7 +199,6 @@
           fi
 
           export PROJECTS="openstack/kuryr-libnetwork $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
           if [ "{kuryr_lib-src}" == "-kuryr_lib-src" ] ; then
               export DEVSTACK_PROJECT_FROM_GIT="kuryr"
           fi
@@ -229,6 +235,11 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork
+            enable_plugin rally git://git.openstack.org/openstack/rally
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
@@ -242,8 +253,6 @@
           export PROJECTS="openstack/rally $PROJECTS"
           export PROJECTS="openstack/devstack-plugin-container $PROJECTS"
 
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
           if [ "{kuryr_lib-src}" == "-kuryr_lib-src" ] ; then
               export DEVSTACK_PROJECT_FROM_GIT="kuryr"
           fi

jenkins/jobs/lvm.yaml

@@ -13,12 +13,15 @@
       - link-logs
       - net-info
       - devstack-checkout
+      - local_conf:
+          conf: |
+            [[local|localrc]]
+            NOVA_BACKEND=LVM
+            LVM_VOLUME_CLEAR=none
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_LOCAL_CONFIG="NOVA_BACKEND=LVM"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"LVM_VOLUME_CLEAR=none"
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE