From ecfd4d103c05868354733260cd88534415338918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= Date: Wed, 22 Jul 2015 23:27:04 +0000 Subject: [PATCH] Clean keystone resources --- example-puppet.py | 17 +++++---- resources/keystone_puppet/meta.yaml | 8 ++-- resources/mariadb_db/actions/remove.yml | 2 +- resources/mariadb_db/actions/run.yml | 2 +- resources/mariadb_db/meta.yaml | 3 ++ .../mariadb_keystone_db/actions/remove.yml | 11 ------ resources/mariadb_keystone_db/actions/run.yml | 13 ------- resources/mariadb_keystone_db/meta.yaml | 30 --------------- .../mariadb_keystone_user/actions/remove.yml | 11 ------ .../mariadb_keystone_user/actions/run.yml | 14 ------- resources/mariadb_keystone_user/meta.yaml | 37 ------------------- resources/mariadb_user/actions/remove.yml | 2 +- resources/mariadb_user/actions/run.yml | 2 +- resources/mariadb_user/meta.yaml | 3 ++ templates/controller.yml | 1 + templates/keystone_base.yml | 4 +- 16 files changed, 28 insertions(+), 132 deletions(-) delete mode 100644 resources/mariadb_keystone_db/actions/remove.yml delete mode 100644 resources/mariadb_keystone_db/actions/run.yml delete mode 100644 resources/mariadb_keystone_db/meta.yaml delete mode 100644 resources/mariadb_keystone_user/actions/remove.yml delete mode 100644 resources/mariadb_keystone_user/actions/run.yml delete mode 100644 resources/mariadb_keystone_user/meta.yaml diff --git a/example-puppet.py b/example-puppet.py index 7f344aad..13bcc5c3 100644 --- a/example-puppet.py +++ b/example-puppet.py @@ -69,13 +69,13 @@ def deploy(): # KEYSTONE keystone_puppet = vr.create('keystone_puppet', 'resources/keystone_puppet', {})[0] - keystone_db = vr.create('keystone_db', 'resources/mariadb_keystone_db/', { + keystone_db = vr.create('keystone_db', 'resources/mariadb_db/', { 'db_name': 'keystone_db', 'login_user': 'root' })[0] - keystone_db_user = vr.create('keystone_db_user', 'resources/mariadb_keystone_user/', { - 'new_user_name': 'keystone', - 'new_user_password': 'keystone', + keystone_db_user = vr.create('keystone_db_user', 'resources/mariadb_user/', { + 'user_name': 'keystone', + 'user_password': 'keystone', })[0] keystone_service_endpoint = vr.create('keystone_service_endpoint', 'resources/keystone_service_endpoint', { 'endpoint_name': 'keystone', @@ -107,12 +107,14 @@ def deploy(): 'port': 'login_port', 'root_user': 'login_user', 'root_password': 'login_password', + 'ip' : 'db_host', }) signals.connect(keystone_db, keystone_db_user, { 'db_name', 'login_port', 'login_user', - 'login_password' + 'login_password', + 'db_host' }) signals.connect(node1, keystone_service_endpoint) @@ -141,8 +143,9 @@ def deploy(): 'db_name', }) signals.connect(keystone_db_user, keystone_puppet, { - 'new_user_name': 'db_user', - 'new_user_password': 'db_password' + 'user_name': 'db_user', + 'user_password': 'db_password', + 'db_host' : 'db_host' }) # OPENRC diff --git a/resources/keystone_puppet/meta.yaml b/resources/keystone_puppet/meta.yaml index cab4e1ae..78a51568 100644 --- a/resources/keystone_puppet/meta.yaml +++ b/resources/keystone_puppet/meta.yaml @@ -8,16 +8,16 @@ input: value: admin_token db_user: schema: str! - value: keystone + value: db_password: schema: str! - value: keystone + value: db_name: schema: str! - value: keystone + value: db_host: schema: str! - value: keystone + value: admin_port: schema: int! diff --git a/resources/mariadb_db/actions/remove.yml b/resources/mariadb_db/actions/remove.yml index 594061a4..1cb172ed 100644 --- a/resources/mariadb_db/actions/remove.yml +++ b/resources/mariadb_db/actions/remove.yml @@ -8,4 +8,4 @@ login_user: root login_password: {{login_password}} login_port: {{login_port}} - login_host: 127.0.0.1 + login_host: {{db_host}} diff --git a/resources/mariadb_db/actions/run.yml b/resources/mariadb_db/actions/run.yml index 4b315b9b..8ec6b356 100644 --- a/resources/mariadb_db/actions/run.yml +++ b/resources/mariadb_db/actions/run.yml @@ -8,4 +8,4 @@ login_user: root login_password: {{ login_password }} login_port: {{ login_port }} - login_host: 127.0.0.1 + login_host: {{db_host}} diff --git a/resources/mariadb_db/meta.yaml b/resources/mariadb_db/meta.yaml index f60ddfb6..6c9640d3 100644 --- a/resources/mariadb_db/meta.yaml +++ b/resources/mariadb_db/meta.yaml @@ -8,6 +8,9 @@ input: db_name: schema: str! value: + db_host: + schema: str! + value: login_user: schema: str! diff --git a/resources/mariadb_keystone_db/actions/remove.yml b/resources/mariadb_keystone_db/actions/remove.yml deleted file mode 100644 index 594061a4..00000000 --- a/resources/mariadb_keystone_db/actions/remove.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: [{{ ip }}] - sudo: yes - tasks: - - name: mariadb db - mysql_db: - name: {{db_name}} - state: absent - login_user: root - login_password: {{login_password}} - login_port: {{login_port}} - login_host: 127.0.0.1 diff --git a/resources/mariadb_keystone_db/actions/run.yml b/resources/mariadb_keystone_db/actions/run.yml deleted file mode 100644 index 3c1d25d6..00000000 --- a/resources/mariadb_keystone_db/actions/run.yml +++ /dev/null @@ -1,13 +0,0 @@ -- hosts: [{{ ip }}] - sudo: yes - tasks: - - name: mariadb db - mysql_db: - name: {{ db_name }} - #collation: utf8_encode_ci - encoding: utf8 - state: present - login_user: root - login_password: {{ login_password }} - login_port: {{ login_port }} - login_host: 127.0.0.1 diff --git a/resources/mariadb_keystone_db/meta.yaml b/resources/mariadb_keystone_db/meta.yaml deleted file mode 100644 index a0ef1e72..00000000 --- a/resources/mariadb_keystone_db/meta.yaml +++ /dev/null @@ -1,30 +0,0 @@ -id: mariadb_keystone_db -handler: ansible -version: 1.0.0 -actions: - run: run.yml - remove: remove.yml -input: - db_name: - schema: str! - value: keystone_db - login_user: - schema: str! - value: root - login_password: - schema: str! - value: - login_port: - schema: int! - value: - ip: - schema: str! - value: - ssh_key: - schema: str! - value: - ssh_user: - schema: str! - value: - -tags: [resource/mariadb_keystone_db, resources/mariadb] diff --git a/resources/mariadb_keystone_user/actions/remove.yml b/resources/mariadb_keystone_user/actions/remove.yml deleted file mode 100644 index 7f6939d4..00000000 --- a/resources/mariadb_keystone_user/actions/remove.yml +++ /dev/null @@ -1,11 +0,0 @@ -- hosts: [{{ ip }}] - sudo: yes - tasks: - - name: mariadb user - mysql_user: - name: {{new_user_name}} - state: absent - login_user: root - login_password: {{login_password}} - login_port: {{login_port}} - login_host: 127.0.0.1 diff --git a/resources/mariadb_keystone_user/actions/run.yml b/resources/mariadb_keystone_user/actions/run.yml deleted file mode 100644 index d600c13d..00000000 --- a/resources/mariadb_keystone_user/actions/run.yml +++ /dev/null @@ -1,14 +0,0 @@ -- hosts: [{{ ip }}] - sudo: yes - tasks: - - name: mariadb user - mysql_user: - name: {{ new_user_name }} - password: {{ new_user_password }} - priv: {{ db_name }}.*:ALL - host: '%' - state: present - login_user: root - login_password: {{ login_password }} - login_port: {{ login_port }} - login_host: 127.0.0.1 diff --git a/resources/mariadb_keystone_user/meta.yaml b/resources/mariadb_keystone_user/meta.yaml deleted file mode 100644 index 73617ca9..00000000 --- a/resources/mariadb_keystone_user/meta.yaml +++ /dev/null @@ -1,37 +0,0 @@ -id: mariadb_keystone_user -handler: ansible -version: 1.0.0 -actions: - run: run.yml - remove: remove.yml -input: - new_user_password: - schema: str! - value: keystone - new_user_name: - schema: str! - value: keystone - db_name: - schema: str! - value: - login_password: - schema: str! - value: - login_port: - schema: int! - value: - login_user: - schema: str! - value: - ip: - schema: str! - value: - ssh_key: - schema: str! - value: - ssh_user: - schema: str! - value: - -tags: [resource/mariadb_keystone_user, resources/mariadb] - diff --git a/resources/mariadb_user/actions/remove.yml b/resources/mariadb_user/actions/remove.yml index bb6df44e..cd7150c4 100644 --- a/resources/mariadb_user/actions/remove.yml +++ b/resources/mariadb_user/actions/remove.yml @@ -8,4 +8,4 @@ login_user: root login_password: {{login_password}} login_port: {{login_port}} - login_host: 127.0.0.1 + login_host: {{db_host}} diff --git a/resources/mariadb_user/actions/run.yml b/resources/mariadb_user/actions/run.yml index 8ddf831f..5fe03c47 100644 --- a/resources/mariadb_user/actions/run.yml +++ b/resources/mariadb_user/actions/run.yml @@ -11,4 +11,4 @@ login_user: root login_password: {{ login_password }} login_port: {{ login_port }} - login_host: 127.0.0.1 + login_host: {{db_host}} diff --git a/resources/mariadb_user/meta.yaml b/resources/mariadb_user/meta.yaml index 56c70a30..6aed07c2 100644 --- a/resources/mariadb_user/meta.yaml +++ b/resources/mariadb_user/meta.yaml @@ -15,6 +15,9 @@ input: db_name: schema: str! value: + db_host: + schema: str! + value: login_password: schema: str! diff --git a/templates/controller.yml b/templates/controller.yml index 9376d04b..46ff41fd 100644 --- a/templates/controller.yml +++ b/templates/controller.yml @@ -25,6 +25,7 @@ resources: login_password: 'mariadb_service::root_password' login_port: 'mariadb_service::port' db_name: 'keystone' + db_host: 'mariadb_service::ip' user_password: 'keystone' user_name: 'keystone' ip: '{{ip}}' diff --git a/templates/keystone_base.yml b/templates/keystone_base.yml index 34fbddf9..330bb5b7 100644 --- a/templates/keystone_base.yml +++ b/templates/keystone_base.yml @@ -4,7 +4,8 @@ resources: - id: keystone_db from: resources/mariadb_db values: - db_name: {{db_name}} + db_name: '{{db_name}}' + db_host: '{{db_host}}' login_user: '{{login_user}}' login_password: '{{login_password}}' login_port: '{{login_port}}' @@ -18,6 +19,7 @@ resources: user_password: '{{user_password}}' user_name: '{{user_name}}' db_name: 'keystone_db::db_name' + db_host: '{{db_host}}' login_user: 'keystone_db::login_user' login_password: 'keystone_db::login_password' login_port: 'keystone_db::login_port'