From 860333cf31954bb0ee7b2edc12c7e32f27ce1306 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Mon, 25 Mar 2019 16:39:18 -0400
Subject: [PATCH] Rename /var/lib/docker-config-scripts to
/var/lib/container-config-scripts
We don't have Docker anymore so let's avoid confusion and rename this
directory.
Change-Id: I79fca28ef8e5396fee78bef992fd800918f05b88
---
common/deploy-steps-tasks.yaml | 6 +++---
.../ironic/ironic-conductor-container-puppet.yaml | 2 +-
.../neutron/neutron-ovs-agent-container-puppet.yaml | 2 +-
deployment/nova/nova-api-container-puppet.yaml | 2 +-
deployment/nova/nova-compute-container-puppet.yaml | 12 ++++++------
deployment/nova/nova-ironic-container-puppet.yaml | 8 ++++----
deployment/swift/swift-proxy-container-puppet.yaml | 4 ++--
docker/services/containers-common.yaml | 2 +-
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/common/deploy-steps-tasks.yaml b/common/deploy-steps-tasks.yaml
index c346cad18b..9d144ef721 100644
--- a/common/deploy-steps-tasks.yaml
+++ b/common/deploy-steps-tasks.yaml
@@ -221,9 +221,9 @@
tags:
- container_config
- - name: Create /var/lib/docker-config-scripts
+ - name: Create /var/lib/container-config-scripts
file:
- path: /var/lib/docker-config-scripts
+ path: /var/lib/container-config-scripts
state: directory
setype: svirt_sandbox_file_t
tags:
@@ -243,7 +243,7 @@
no_log: True
copy:
content: "{{ item[1].content }}"
- dest: "/var/lib/docker-config-scripts/{{ item[0] }}"
+ dest: "/var/lib/container-config-scripts/{{ item[0] }}"
force: yes
mode: "{{ item[1].mode | default('0600', true) }}"
setype: svirt_sandbox_file_t
diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
index 3282385f2e..9badf6a864 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -498,7 +498,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/puppet-generated/ironic/etc/ironic:/etc/ironic:ro
- - /var/lib/docker-config-scripts/create_swift_temp_url_key.sh:/create_swift_temp_url_key.sh:ro
+ - /var/lib/container-config-scripts/create_swift_temp_url_key.sh:/create_swift_temp_url_key.sh:ro
user: root
command: "/usr/bin/bootstrap_host_exec ironic_conductor /create_swift_temp_url_key.sh"
- {}
diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
index 28533953f8..1877815d82 100644
--- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
+++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml
@@ -310,7 +310,7 @@ outputs:
-
- /var/lib/kolla/config_files/neutron_ovs_agent.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/neutron/:/var/lib/kolla/config_files/src:ro
- - /var/lib/docker-config-scripts/neutron_ovs_agent_launcher.sh:/neutron_ovs_agent_launcher.sh:ro
+ - /var/lib/container-config-scripts/neutron_ovs_agent_launcher.sh:/neutron_ovs_agent_launcher.sh:ro
- /lib/modules:/lib/modules:ro
- /run/openvswitch:/run/openvswitch:shared,z
environment:
diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml
index 88301a3834..7f81478dad 100644
--- a/deployment/nova/nova-api-container-puppet.yaml
+++ b/deployment/nova/nova-api-container-puppet.yaml
@@ -409,7 +409,7 @@ outputs:
- *nova_api_bootstrap_volumes
-
- /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
- - /var/lib/docker-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro
+ - /var/lib/container-config-scripts/nova_api_ensure_default_cell.sh:/nova_api_ensure_default_cell.sh:ro
user: root
command: "/usr/bin/bootstrap_host_exec nova_api /nova_api_ensure_default_cell.sh"
step_4:
diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml
index db6a874164..c83660900b 100644
--- a/deployment/nova/nova-compute-container-puppet.yaml
+++ b/deployment/nova/nova-compute-container-puppet.yaml
@@ -503,8 +503,8 @@ outputs:
detach: false
volumes:
- /var/lib/nova:/var/lib/nova:shared,z
- - /var/lib/docker-config-scripts/:/docker-config-scripts/:z
- command: "/docker-config-scripts/pyshim.sh /docker-config-scripts/nova_statedir_ownership.py"
+ - /var/lib/container-config-scripts/:/container-config-scripts/:z
+ command: "/container-config-scripts/pyshim.sh /container-config-scripts/nova_statedir_ownership.py"
environment:
# NOTE: this should force this container to re-run on each
# update (scale-out, etc.)
@@ -521,9 +521,9 @@ outputs:
privileged: false
detach: false
volumes:
- - /var/lib/docker-config-scripts/:/docker-config-scripts/:z
+ - /var/lib/container-config-scripts/:/container-config-scripts/:z
- /var/lib/config-data/puppet-generated/nova_libvirt/etc/nova:/etc/nova:ro
- command: "/docker-config-scripts/pyshim.sh /docker-config-scripts/nova_wait_for_placement_service.py"
+ command: "/container-config-scripts/pyshim.sh /container-config-scripts/nova_wait_for_placement_service.py"
nova_compute:
start_order: 3
image: *nova_compute_image
@@ -580,9 +580,9 @@ outputs:
- /var/lib/config-data/nova_libvirt/etc/my.cnf.d/:/etc/my.cnf.d/:ro
- /var/lib/config-data/nova_libvirt/etc/nova/:/etc/nova/:ro
- /var/log/containers/nova:/var/log/nova
- - /var/lib/docker-config-scripts/:/docker-config-scripts/
+ - /var/lib/container-config-scripts/:/container-config-scripts/
user: root
- command: "/docker-config-scripts/pyshim.sh /docker-config-scripts/nova_cell_v2_discover_host.py"
+ command: "/container-config-scripts/pyshim.sh /container-config-scripts/nova_cell_v2_discover_host.py"
- {}
host_prep_tasks:
list_concat:
diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml
index 468a200327..abadcfdac6 100644
--- a/deployment/nova/nova-ironic-container-puppet.yaml
+++ b/deployment/nova/nova-ironic-container-puppet.yaml
@@ -125,8 +125,8 @@ outputs:
detach: false
volumes:
- /var/lib/nova:/var/lib/nova:shared,z
- - /var/lib/docker-config-scripts/:/docker-config-scripts/
- command: "/docker-config-scripts/pyshim.sh /docker-config-scripts/nova_statedir_ownership.py"
+ - /var/lib/container-config-scripts/:/container-config-scripts/
+ command: "/container-config-scripts/pyshim.sh /container-config-scripts/nova_statedir_ownership.py"
step_5:
nova_compute:
image: *nova_ironic_image
@@ -169,9 +169,9 @@ outputs:
- /var/lib/config-data/nova/etc/my.cnf.d/:/etc/my.cnf.d/:ro
- /var/lib/config-data/nova/etc/nova/:/etc/nova/:ro
- /var/log/containers/nova:/var/log/nova
- - /var/lib/docker-config-scripts/:/docker-config-scripts/
+ - /var/lib/container-config-scripts/:/container-config-scripts/
user: root
- command: "/docker-config-scripts/pyshim.sh /docker-config-scripts/nova_cell_v2_discover_host.py"
+ command: "/container-config-scripts/pyshim.sh /container-config-scripts/nova_cell_v2_discover_host.py"
host_prep_tasks:
- name: create persistent directories
file:
diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml
index 311b2fcd47..c366f0cf8b 100644
--- a/deployment/swift/swift-proxy-container-puppet.yaml
+++ b/deployment/swift/swift-proxy-container-puppet.yaml
@@ -383,7 +383,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/puppet-generated/swift/etc/swift:/etc/swift:ro
- - /var/lib/docker-config-scripts/create_swift_secret.sh:/create_swift_secret.sh:ro
+ - /var/lib/container-config-scripts/create_swift_secret.sh:/create_swift_secret.sh:ro
user: root
command: "/usr/bin/bootstrap_host_exec swift_proxy /create_swift_secret.sh"
- {}
@@ -399,7 +399,7 @@ outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/puppet-generated/swift/etc/swift:/etc/swift:rw
- - /var/lib/docker-config-scripts/set_swift_keymaster_key_id.sh:/set_swift_keymaster_key_id.sh:ro
+ - /var/lib/container-config-scripts/set_swift_keymaster_key_id.sh:/set_swift_keymaster_key_id.sh:ro
user: root
command: "/set_swift_keymaster_key_id.sh"
environment:
diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml
index c15d6518cc..2410e1b4d6 100644
--- a/docker/services/containers-common.yaml
+++ b/docker/services/containers-common.yaml
@@ -124,7 +124,7 @@ outputs:
value:
list_concat:
- *volumes_base
- - - /var/lib/docker-config-scripts/container_puppet_apply.sh:/container_puppet_apply.sh:ro
+ - - /var/lib/container-config-scripts/container_puppet_apply.sh:/container_puppet_apply.sh:ro
# container_puppet_apply.sh will copy this to /etc/puppet in the container
- /etc/puppet:/tmp/puppet-etc:ro
- /usr/share/openstack-puppet/modules:/usr/share/openstack-puppet/modules:ro