[CORD-1588]
Set the name of the xos-core container for synchronizers using a mounted
global config file, cleanup of DNS and DHCP options for profiles
Change-Id: I79a744bb0c267a554513e03683d92f1fc285832e
diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 2b9b9f2..03be231 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -4,17 +4,14 @@
# where the cord_profile directory is on the config node
config_cord_profile_dir: "/opt/cord_profile"
-head_cord_dir: "/opt/cord"
-
pki_dir: "{{ playbook_dir }}/pki"
ssh_pki_dir: "{{ playbook_dir }}/ssh_pki"
credentials_dir: "{{ playbook_dir }}/credentials"
-head_credentials_dir: "/opt/credentials"
-
# where cord files are copied to on head node
-head_cord_profile_dir: "/opt/cord_profile"
head_cord_dir: "/opt/cord"
+head_cord_profile_dir: "/opt/cord_profile"
+head_credentials_dir: "/opt/credentials"
# For storing OpenStack images
image_dir: /opt/images
diff --git a/roles/cord-profile/tasks/main.yml b/roles/cord-profile/tasks/main.yml
index b9b5017..830462e 100644
--- a/roles/cord-profile/tasks/main.yml
+++ b/roles/cord-profile/tasks/main.yml
@@ -86,6 +86,7 @@
mode: 0644
with_items:
- xos_config.yaml
+ - xos_config_synchronizer.yaml
- deployment.yaml
- xos.yaml
- gateway-config.yml
diff --git a/roles/cord-profile/templates/docker-compose.yml.j2 b/roles/cord-profile/templates/docker-compose.yml.j2
index 74551a3..84994e1 100644
--- a/roles/cord-profile/templates/docker-compose.yml.j2
+++ b/roles/cord-profile/templates/docker-compose.yml.j2
@@ -320,6 +320,7 @@
- xos_redis:redis
{% endif %}
volumes:
+ - {{ head_cord_profile_dir }}/xos_config_synchronizer.yaml:/opt/xos/xos_config.yaml:ro
- {{ head_cord_profile_dir }}/node_key:/opt/cord_profile/node_key:ro
- {{ head_credentials_dir }}:/opt/xos/services/{{ svc.name }}/credentials:ro
- {{ head_cord_profile_dir }}/im_cert_chain.pem:/usr/local/share/ca-certificates/local_certs.crt:ro
diff --git a/roles/cord-profile/templates/xos_config_synchronizer.yaml.j2 b/roles/cord-profile/templates/xos_config_synchronizer.yaml.j2
new file mode 100644
index 0000000..bc12c2e
--- /dev/null
+++ b/roles/cord-profile/templates/xos_config_synchronizer.yaml.j2
@@ -0,0 +1,15 @@
+---
+# generated by cord-profile from xos_config_synchronizer.yaml.j2
+
+accessor:
+ endpoint: "xos-core.{{ site_suffix }}:50051"
+
+logging:
+ file: '/var/log/xos_synchronizer.log'
+ logstash_hostport: 'cordloghost.{{ site_suffix }}:5617'
+ level: {{ xos_logging_level }}
+ channels:
+{% for channel in xos_logging_channels %}
+ - {{ channel }}
+{% endfor %}
+