CORD-1151
update to use build_cord_dir variable, per platform-install changes
increase length of field holding service ssh key
Change-Id: If404c4a232e71e76fb36df62258f0f795c717fe4
diff --git a/group_vars/all b/group_vars/all
index 8471ce6..8cdff65 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -4,61 +4,62 @@
# Defaults for XOS container build and publish roles.
# Can be overridden by variables in the profile manifest.
-cord_dir: "{{ ansible_user_dir + '/cord' }}"
+# the path below is a hack, and going away soon
+build_cord_dir: "{{ playbook_dir ~ '/../..' }}"
chameleon_dirs:
- - "{{ cord_dir }}/orchestration/xos/containers/chameleon/tmp.chameleon"
- - "{{ cord_dir }}/orchestration/xos/containers/xos/tmp.chameleon"
+ - "{{ build_cord_dir }}/orchestration/xos/containers/chameleon/tmp.chameleon"
+ - "{{ build_cord_dir }}/orchestration/xos/containers/xos/tmp.chameleon"
docker_images:
- name: "xosproject/xos-base"
- path: "{{ cord_dir }}/orchestration/xos/containers/xos"
+ path: "{{ build_cord_dir }}/orchestration/xos/containers/xos"
dockerfile: "Dockerfile.base"
pull: True
build: False
publish: False
- name: "xosproject/xos-postgres"
- path: "{{ cord_dir }}/orchestration/xos/containers/postgresql"
+ path: "{{ build_cord_dir }}/orchestration/xos/containers/postgresql"
dockerfile: "Dockerfile"
pull: True
publish: True
- name: "xosproject/xos"
- path: "{{ cord_dir }}/orchestration/xos"
+ path: "{{ build_cord_dir }}/orchestration/xos"
dockerfile: "containers/xos/Dockerfile.xos"
pull: False
publish: True
- name: "xosproject/chameleon"
- path: "{{ cord_dir }}/orchestration/xos/containers/chameleon"
+ path: "{{ build_cord_dir }}/orchestration/xos/containers/chameleon"
dockerfile: "Dockerfile.chameleon"
pull: False
publish: True
- name: "xosproject/xos-client"
- path: "{{ cord_dir }}/orchestration/xos"
+ path: "{{ build_cord_dir }}/orchestration/xos"
dockerfile: "containers/xos/Dockerfile.client"
pull: False
publish: True
- name: "xosproject/xos-synchronizer-base"
- path: "{{ cord_dir }}/orchestration/xos"
+ path: "{{ build_cord_dir }}/orchestration/xos"
dockerfile: "containers/xos/Dockerfile.synchronizer-base"
pull: False
publish: True
- name: "xosproject/xos-ws"
- path: "{{ cord_dir }}/orchestration/xos-rest-gw" # TODO rename repo
+ path: "{{ build_cord_dir }}/orchestration/xos-rest-gw" # TODO rename repo
dockerfile: "Dockerfile"
pull: False
publish: True
- name: "xosproject/xos-gui"
- path: "{{ cord_dir }}/orchestration/xos-gui"
+ path: "{{ build_cord_dir }}/orchestration/xos-gui"
dockerfile: "Dockerfile"
pull: False
publish: True
- name: "xosproject/xos-gui-extension-builder"
- path: "{{ cord_dir }}/orchestration/xos-gui/"
+ path: "{{ build_cord_dir }}/orchestration/xos-gui/"
dockerfile: "Dockerfile.xos-gui-extension-builder"
pull: False
publish: False
- name: "xosproject/xos-corebuilder"
- path: "{{ cord_dir }}/orchestration/xos"
+ path: "{{ build_cord_dir }}/orchestration/xos"
dockerfile: "containers/xos/Dockerfile.corebuilder"
pull: False
publish: True
diff --git a/roles/build-images/tasks/main.yml b/roles/build-images/tasks/main.yml
index a7226a9..c6adab6 100644
--- a/roles/build-images/tasks/main.yml
+++ b/roles/build-images/tasks/main.yml
@@ -3,12 +3,12 @@
- name: Clean up chameleon temp directory
file:
- path: "{{ cord_dir }}/orchestration/xos/containers/chameleon/tmp.chameleon"
+ path: "{{ build_cord_dir }}/orchestration/xos/containers/chameleon/tmp.chameleon"
state: absent
with_items: "{{ chameleon_dirs }}"
- name: Populate chameleon temp directory
- shell: cp -a "{{ cord_dir }}/component/chameleon" "{{ item }}"
+ shell: cp -a "{{ build_cord_dir }}/component/chameleon" "{{ item }}"
with_items: "{{ chameleon_dirs }}"
tags:
- skip_ansible_lint # docker can't access files outside of build context, so we must copy
@@ -40,7 +40,7 @@
- name: Build xos-gui-extensions docker images
docker_image:
name: "xosproject/gui-extension-{{ item.name }}"
- path: "{{ cord_dir }}/{{ item.path }}"
+ path: "{{ build_cord_dir }}/{{ item.path }}"
tag: "{{ build_docker_tag }}"
pull: False
force: True
@@ -50,7 +50,7 @@
- name: Build synchronizer docker images
docker_image:
name: "xosproject/{{ item.name }}-synchronizer"
- path: "{{ cord_dir }}/{{ item.path }}/xos/synchronizer"
+ path: "{{ build_cord_dir }}/{{ item.path }}/xos/synchronizer"
dockerfile: "Dockerfile.synchronizer"
tag: "{{ build_docker_tag }}"
pull: False
diff --git a/xos/core/models/core.xproto b/xos/core/models/core.xproto
index ef0cce7..7bdf6fe 100644
--- a/xos/core/models/core.xproto
+++ b/xos/core/models/core.xproto
@@ -269,8 +269,8 @@
required bool published = 6 [default = True, null = False, db_index = False, blank = True];
optional string view_url = 7 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
optional string icon_url = 8 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
- optional string public_key = 9 [help_text = "Public key string", max_length = 1024, null = True, db_index = False, blank = True];
- optional string private_key_fn = 10 [db_index = False, max_length = 1024, null = True, content_type = "stripped", blank = True];
+ optional string public_key = 9 [help_text = "Public key string", max_length = 4096, null = True, db_index = False, blank = True];
+ optional string private_key_fn = 10 [db_index = False, max_length = 4096, null = True, content_type = "stripped", blank = True];
optional string service_specific_id = 11 [db_index = False, max_length = 30, null = True, content_type = "stripped", blank = True];
optional string service_specific_attribute = 12 [db_index = False, null = True, blank = True];
}