From adb2ef6f64a50b7b50fdfc56e425a5d73fe191e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <loles@mirantis.com>
Date: Thu, 25 Jun 2015 14:02:27 +0000
Subject: [PATCH] Add glance

---
 resources/glance_registry_service/meta.yaml | 33 +--------------------
 templates/controller.yml                    | 15 ++++++++++
 templates/glance_register.yml               | 28 -----------------
 templates/glance_registry.yml               | 26 ++++++++++++++++
 4 files changed, 42 insertions(+), 60 deletions(-)
 delete mode 100644 templates/glance_register.yml
 create mode 100644 templates/glance_registry.yml

diff --git a/resources/glance_registry_service/meta.yaml b/resources/glance_registry_service/meta.yaml
index 41734322..e0083961 100644
--- a/resources/glance_registry_service/meta.yaml
+++ b/resources/glance_registry_service/meta.yaml
@@ -7,7 +7,7 @@ input:
       value:
     image:
       schema: str!
-      value:
+      value: cgenie/centos-rdo-glance-registry
     ports:
       schema: [{value: [{value: int}]}]
       value: []
@@ -24,35 +24,4 @@ input:
       schema: str!
       value: []
 
-    db_host:
-      schema: str!
-      value:
-    db_root_password:
-      schema: str!
-      value:
-    db_name:
-      schema: str!
-      value:
-    db_password:
-      schema: str!
-      value:
-    db_user:
-      schema: str!
-      value:
-    keystone_admin_token:
-      schema: str!
-      value:
-    keystone_admin_tenant:
-      schema: str!
-      value:
-    keystone_user:
-      schema: str!
-      value:
-    keystone_password:
-      schema: str!
-      value:
-    keystone_host:
-      schema: str!
-      value:
-
 tags: [resource/container]
diff --git a/templates/controller.yml b/templates/controller.yml
index d2861c3b..2c2373ac 100644
--- a/templates/controller.yml
+++ b/templates/controller.yml
@@ -57,6 +57,7 @@ resources:
       keystone_ip: 'keystone_service_1::ip'
       keystone_admin_port: 'keystone_service_1::admin_port'
       keystone_port: 'keystone_service_1::port'
+      admin_token: 'keystone_config_1::admin_token'
 
   - id: glance_base
     from: templates/glance_base.yml
@@ -71,5 +72,19 @@ resources:
       ssh_user: '{{ssh_user}}'
       ssh_key: '{{ssh_key}}'
 
+  - id: glance_registry_1
+    from: templates/glance_registry.yml
+    values:
+      idx: 1
+      keystone_admin_port: 'keystone_service_1::admin_port'
+      keystone_ip: 'keystone_service_1::ip'
+      mysql_password: 'glance_db_user::user_password'
+      mysql_user: 'keystone_db_user::user_name'
+      mysql_db: 'keystone_db_user::db_name'
+      mysql_ip: 'mariadb_service::ip'
+      ip: '{{ip}}'
+      ssh_user: '{{ssh_user}}'
+      ssh_key: '{{ssh_key}}'
+
 tags: ['resources/controller', 'resource/primary_controller']
 
diff --git a/templates/glance_register.yml b/templates/glance_register.yml
deleted file mode 100644
index 6e483d31..00000000
--- a/templates/glance_register.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-id: glance_register_{{idx}}
-
-resources:
-  - id: keystone_config_{{idx}}
-    from: resources/keystone_config
-    values:
-      config_dir: '/etc/solar/keystone_{{idx}}'
-      db_host: '{{db_host}}'
-      db_port: '{{db_port}}'
-      db_name: '{{db_name}}'
-      db_user: '{{db_user}}'
-      db_password: '{{db_password}}'
-      ip: '{{ip}}'
-      ssh_user: '{{ssh_user}}'
-      ssh_key: '{{ssh_key}}'
-
-
-  - id:  keystone_service_{{idx}}
-    from: resources/keystone_service
-    values:
-      image: 'kollaglue/centos-rdo-k-keystone'
-      config_dir: 'keystone_config_{{idx}}::config_dir'
-      ip: 'keystone_config_{{idx}}::ip'
-      ssh_user: 'keystone_config_{{idx}}::ssh_user'
-      ssh_key: 'keystone_config_{{idx}}::ssh_key'
-
-tags: ['resources/keystone', 'resource/keystone_api']
-
diff --git a/templates/glance_registry.yml b/templates/glance_registry.yml
new file mode 100644
index 00000000..b86a781e
--- /dev/null
+++ b/templates/glance_registry.yml
@@ -0,0 +1,26 @@
+id: glance_register_{{idx}}
+
+resources:
+  - id: glance_config_{{idx}}
+    from: resources/glance_config
+    values:
+      keystone_admin_port: '{{keystone_admin_port}}'
+      keystone_ip: '{{keystone_ip}}'
+      mysql_password: '{{mysql_password}}'
+      mysql_user: '{{mysql_user}}'
+      mysql_db: '{{mysql_db}}'
+      mysql_ip: '{{mysql_ip}}'
+      ip: '{{ip}}'
+      ssh_user: '{{ssh_user}}'
+      ssh_key: '{{ssh_key}}'
+
+
+  - id:  glance_registry_{{idx}}
+    from: resources/glance_registry_service
+    values:
+      ip: 'keystone_config_{{idx}}::ip'
+      ssh_user: 'keystone_config_{{idx}}::ssh_user'
+      ssh_key: 'keystone_config_{{idx}}::ssh_key'
+
+tags: ['resources/keystone', 'resource/keystone_api']
+