Merge branch 'x' into x-fixes

x/resources/keystone/actions/run.yml

@@ -1,6 +1,13 @@
-# TODO
 - hosts: [{{ ip }}]
   sudo: yes
   tasks:
-    - shell: docker run -d --net="host" --privileged \
-        --name {{ name }} {{ image }}
+    - name: keystone container
+      docker:
+        name: {{ name }}
+        image: {{ image }}
+        state: running
+        ports:
+        - {{ port }}:5000
+        - {{ admin_port }}:35357
+        volumnes:
+        - {{ config_dir }}:/etc/keystone

x/resources/keystone/meta.yaml

@@ -2,6 +2,10 @@ id: keystone
 handler: ansible
 version: 1.0.0
 input:
+    image: kollaglue/centos-rdo-keystone
+    config_dir:
+    admin_port:
+    port:
     ip:
-    port: 5000
-    image: garland/docker-openstack-keystone
+    ssh_key:
+    ssh_user:

x/resources/mariadb_db/actions/remove.yml

@@ -0,0 +1,11 @@
+- hosts: [{{ ip }}]
+  sudo: yes
+  tasks:
+    - name: mariadb db
+      mysql_db:
+        name: {{name}}
+        state: absent
+        login_user: root
+        login_password: {{login_password}}
+        login_port: {{login_port}}
+        login_host: 127.0.0.1

x/resources/mariadb_db/actions/run.yml

@@ -0,0 +1,11 @@
+- hosts: [{{ ip }}]
+  sudo: yes
+  tasks:
+    - name: mariadb db
+      mysql_db:
+        name: {{name}}
+        state: present
+        login_user: root
+        login_password: {{login_password}}
+        login_port: {{login_port}}
+        login_host: 127.0.0.1

x/resources/mariadb_db/meta.yaml

@@ -0,0 +1,13 @@
+id: mariadb_table
+handler: ansible
+version: 1.0.0
+actions:
+    run: run.yml
+    remove: remove.yml
+input:
+    login_password:
+    login_port:
+    login_user:
+    ip: 
+    ssh_key: 
+    ssh_user: 

x/resources/mariadb_table/meta.yaml

@@ -1,10 +0,0 @@
-id: mariadb_user
-handler: ansible
-version: 1.0.0
-actions:
-    run: run.yml
-    remove: remove.yml
-input:
-    name: name
-    password: password
-    users: []

x/resources/mariadb_user/actions/remove.yml

@@ -0,0 +1,11 @@
+- hosts: [{{ ip }}]
+  sudo: yes
+  tasks:
+    - name: mariadb user
+      mysql_user:
+        name: {{name}}
+        state: absent
+        login_user: root
+        login_password: {{login_password}}
+        login_port: {{login_port}}
+        login_host: 127.0.0.1

x/resources/mariadb_user/actions/run.yml

@@ -0,0 +1,13 @@
+- hosts: [{{ ip }}]
+  sudo: yes
+  tasks:
+    - name: mariadb user
+      mysql_user:
+        name: {{name}}
+        password: {{password}}
+        priv: {{db}}.*:ALL
+        state: present
+        login_user: root
+        login_password: {{login_password}}
+        login_port: {{login_port}}
+        login_host: 127.0.0.1

x/resources/mariadb_user/meta.yaml

@@ -5,5 +5,11 @@ actions:
     run: run.yml
     remove: remove.yml
 input:
-    name: name
-    password: password
+    password:
+    db:
+    login_password:
+    login_port:
+    login_user:
+    ip: 
+    ssh_key: 
+    ssh_user: