Merge "Don't disable satellite repo after registration"

[apex-tripleo-heat-templates.git] / docker / services / nova-ironic.yaml

diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml
index 5b46010..9941abd 100644 (file)
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@@ -12,7 +12,7 @@ parameters:
     description: image
     default: 'centos-binary-nova-compute-ironic:latest'
     type: string
-  DockerNovaBaseImage:
+  DockerNovaConfigImage:
     description: image
     default: 'centos-binary-nova-base:latest'
     type: string
@@ -47,10 +47,6 @@ outputs:
       config_settings: {get_attr: [NovaIronicBase, role_data, config_settings]}
       step_config: &step_config
         get_attr: [NovaIronicBase, role_data, step_config]
-      docker_image: &nova_ironic_image
-        list_join:
-        - '/'
-        - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
       puppet_config:
         config_volume: nova
         puppet_tags: nova_config,nova_paste_api_ini
@@ -58,34 +54,32 @@ outputs:
         config_image:
           list_join:
           - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerNovaBaseImage} ]
+          - [ {get_param: DockerNamespace}, {get_param: DockerNovaConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/nova_ironic.json:
            command: /usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/rootwrap.conf
-           config_files:
-           - dest: /etc/nova/nova.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/nova.conf
-           - dest: /etc/nova/rootwrap.conf
-             owner: nova
-             perm: '0600'
-             source: /var/lib/kolla/config_files/src/etc/nova/rootwrap.conf
       docker_config:
         step_5:
           novacompute:
-            image: *nova_ironic_image
+            image:
+              list_join:
+              - '/'
+              - [ {get_param: DockerNamespace}, {get_param: DockerNovaComputeImage} ]
             net: host
             privileged: true
             user: root
             restart: always
             volumes:
               - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova:/var/lib/kolla/config_files/src:ro
+              - /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
               - /etc/localtime:/etc/localtime:ro
               - /run:/run
               - /dev:/dev
               - /etc/iscsi:/etc/iscsi
-              - nova_compute:/var/lib/nova/
+              - /var/lib/nova/:/var/lib/nova
             environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      upgrade_tasks:
+        - name: Stop and disable nova-compute service
+          tags: step2
+          service: name=nova-compute state=stopped enabled=no