Merge "docker: don't use custom run-os-net-config"

docker/firstboot/start_docker_agents.sh

@@ -43,6 +43,7 @@ AGENT_COMMAND_MOUNTS="-v /var/lib/etc-data:/var/lib/etc-data \
                       -v /var/lib/cloud:/var/lib/cloud \
                       -v /var/lib/heat-cfntools:/var/lib/heat-cfntools \
                       -v /etc/sysconfig/docker:/etc/sysconfig/docker \
+                      -v /etc/sysconfig/network-scripts:/etc/sysconfig/network-scripts \
                       -v /usr/lib64/libseccomp.so.2:/usr/lib64/libseccomp.so.2"
 
 

docker/post.j2.yaml

@@ -252,27 +252,6 @@ resources:
           environment:
             - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
 
-  NovaComputeContainersDeploymentNetconfig:
-    type: OS::Heat::SoftwareDeploymentGroup
-    depends_on: NovaComputeContainersDeploymentOVS
-    properties:
-      name: NovaComputeContainersDeploymentNetconfig
-      config: {get_resource: NovaComputeContainersConfigNetconfig}
-      servers: {get_param: [servers, {{role.name}}]}
-
-  # We run os-net-config here because we depend on the ovs containers to be up
-  # and running before we configure the network.  This allows explicit timing
-  # of the network configuration.
-  NovaComputeContainersConfigNetconfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      outputs:
-      - name: result
-      config: |
-        #!/bin/bash
-        /usr/local/bin/run-os-net-config
-
   {{role.name}}ContainersConfig_Step1:
     type: OS::Heat::StructuredConfig
     depends_on: CopyJsonDeployment
@@ -291,7 +270,7 @@ resources:
 
   {{role.name}}ContainersDeployment_Step1:
     type: OS::Heat::StructuredDeploymentGroup
-    depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy, NovaComputeContainersDeploymentNetconfig]
+    depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
     properties:
       name: {{role.name}}ContainersDeployment_Step1
       servers: {get_param: [servers, {{role.name}}]}