diff --git a/smardigo/provisioning/form/simple-connect.json b/smardigo/provisioning/form/simple-connect.json
index 9f3a2b5..9800f45 100644
--- a/smardigo/provisioning/form/simple-connect.json
+++ b/smardigo/provisioning/form/simple-connect.json
@@ -47,103 +47,357 @@
"logic" : [ ],
"reorder" : false
}, {
- "label" : "HTML",
- "labelPosition" : "left-left",
- "className" : "",
- "attrs" : [ {
- "attr" : "",
- "value" : ""
- } ],
- "content" : "
\n connect-admin:connect-admin\n
\n",
- "refreshOnChange" : true,
- "mask" : false,
- "tableView" : true,
- "alwaysEnabled" : false,
- "type" : "htmlelement",
- "input" : false,
- "key" : "html2",
- "validate" : {
- "customMessage" : "",
- "json" : ""
- },
- "conditional" : {
- "show" : "",
- "when" : "",
- "json" : ""
- },
- "tabs" : null,
- "encrypted" : false,
- "properties" : { },
- "tags" : null,
- "customConditional" : "",
- "logic" : [ ],
- "refreshOn" : "data",
- "reorder" : false
- }, {
- "label" : "HTML",
- "labelPosition" : "left-left",
- "className" : "",
- "attrs" : [ {
- "attr" : "",
- "value" : ""
- } ],
- "content" : "\n\n\n wordpress-admin:wordpress-admin\n
\n",
- "refreshOnChange" : true,
- "mask" : false,
- "tableView" : true,
- "alwaysEnabled" : false,
- "type" : "htmlelement",
- "input" : false,
- "key" : "html4",
- "validate" : {
- "customMessage" : "",
- "json" : ""
- },
- "conditional" : {
- "show" : "",
- "when" : "",
- "json" : ""
- },
- "tabs" : null,
- "encrypted" : false,
- "properties" : { },
- "tags" : null,
- "customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
- "logic" : [ ],
- "refreshOn" : "data",
- "reorder" : false
- }, {
- "label" : "HTML",
- "labelPosition" : "left-left",
- "className" : "",
- "attrs" : [ {
- "attr" : "",
- "value" : ""
+ "label" : "Columns",
+ "columns" : [ {
+ "components" : [ {
+ "label" : "Password",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "tabindex" : "C0nnect-Admin!",
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "password",
+ "input" : true,
+ "key" : "connect_admin_password",
+ "defaultValue" : "awx-admin",
+ "validate" : {
+ "required" : true,
+ "minLength" : null,
+ "maxLength" : null,
+ "minWords" : null,
+ "maxWords" : null,
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "",
+ "logic" : [ ],
+ "reorder" : false
+ } ],
+ "width" : 3,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column"
+ }, {
+ "components" : [ {
+ "label" : "HTML",
+ "labelPosition" : "left-left",
+ "className" : "",
+ "attrs" : [ {
+ "attr" : "",
+ "value" : ""
+ } ],
+ "content" : "",
+ "refreshOnChange" : true,
+ "mask" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "htmlelement",
+ "input" : false,
+ "key" : "html2",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : null,
+ "customConditional" : "",
+ "logic" : [ ],
+ "refreshOn" : "data",
+ "reorder" : false
+ } ],
+ "width" : 9,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column"
+ }, {
+ "width" : 3,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ ]
+ }, {
+ "width" : 9,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "HTML",
+ "labelPosition" : "left-left",
+ "className" : "",
+ "attrs" : [ {
+ "attr" : "",
+ "value" : ""
+ } ],
+ "content" : "",
+ "refreshOnChange" : true,
+ "mask" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "htmlelement",
+ "input" : false,
+ "key" : "html4",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : null,
+ "customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
+ "logic" : [ ],
+ "refreshOn" : "data",
+ "reorder" : false
+ } ]
+ }, {
+ "width" : 3,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "Password",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "tabindex" : "wordpress-admin",
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "password",
+ "input" : true,
+ "key" : "wordpress_admin_password",
+ "defaultValue" : "awx-admin",
+ "validate" : {
+ "required" : true,
+ "minLength" : null,
+ "maxLength" : null,
+ "minWords" : null,
+ "maxWords" : null,
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
+ "logic" : [ ],
+ "reorder" : false
+ } ]
+ }, {
+ "width" : 9,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "HTML",
+ "labelPosition" : "left-left",
+ "className" : "",
+ "attrs" : [ {
+ "attr" : "",
+ "value" : ""
+ } ],
+ "content" : "",
+ "refreshOnChange" : true,
+ "mask" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "htmlelement",
+ "input" : false,
+ "key" : "html5",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : null,
+ "customConditional" : "show = data['connect-features'].includes(\"connect_wordpress\") ",
+ "logic" : [ ],
+ "refreshOn" : "data",
+ "reorder" : false
+ } ]
+ }, {
+ "width" : 3,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "Password",
+ "hideLabel" : true,
+ "labelPosition" : "left-left",
+ "tabindex" : "C0nnect-Realm-Admin!",
+ "showWordCount" : false,
+ "showCharCount" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "password",
+ "input" : true,
+ "key" : "keycloak_admin_password",
+ "defaultValue" : "awx-admin",
+ "validate" : {
+ "required" : true,
+ "minLength" : null,
+ "maxLength" : null,
+ "minWords" : null,
+ "maxWords" : null,
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "inputFormat" : "plain",
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : [ ],
+ "customConditional" : "",
+ "logic" : [ ],
+ "reorder" : false
+ } ]
+ }, {
+ "width" : 9,
+ "offset" : 0,
+ "push" : 0,
+ "pull" : 0,
+ "type" : "column",
+ "input" : false,
+ "hideOnChildrenHidden" : false,
+ "key" : "column",
+ "tableView" : true,
+ "label" : "Column",
+ "components" : [ {
+ "label" : "HTML",
+ "labelPosition" : "left-left",
+ "className" : "",
+ "attrs" : [ {
+ "attr" : "",
+ "value" : ""
+ } ],
+ "content" : "",
+ "refreshOnChange" : true,
+ "mask" : false,
+ "tableView" : true,
+ "alwaysEnabled" : false,
+ "type" : "htmlelement",
+ "input" : false,
+ "key" : "html3",
+ "validate" : {
+ "customMessage" : "",
+ "json" : ""
+ },
+ "conditional" : {
+ "show" : "",
+ "when" : "",
+ "json" : ""
+ },
+ "tabs" : null,
+ "encrypted" : false,
+ "properties" : { },
+ "tags" : null,
+ "customConditional" : "",
+ "logic" : [ ],
+ "refreshOn" : "data",
+ "reorder" : false
+ } ]
} ],
- "content" : "\n connect-realm-admin:connect-realm-admin\n
\n",
- "refreshOnChange" : true,
"mask" : false,
- "tableView" : true,
+ "tableView" : false,
"alwaysEnabled" : false,
- "type" : "htmlelement",
+ "type" : "columns",
"input" : false,
- "key" : "html3",
- "validate" : {
- "customMessage" : "",
- "json" : ""
- },
+ "key" : "columns2",
"conditional" : {
"show" : "",
"when" : "",
"json" : ""
},
"tabs" : null,
- "encrypted" : false,
"properties" : { },
"tags" : null,
"customConditional" : "",
"logic" : [ ],
- "refreshOn" : "data",
"reorder" : false
} ],
"tabs" : null,
diff --git a/smardigo/provisioning/process/simple-connect.bpmn b/smardigo/provisioning/process/simple-connect.bpmn
index d37298f..7be5a32 100644
--- a/smardigo/provisioning/process/simple-connect.bpmn
+++ b/smardigo/provisioning/process/simple-connect.bpmn
@@ -76,6 +76,13 @@
+
+
+
+ wordpress-admin
+
+
+
Flow_1rtcnw8
diff --git a/smardigo/provisioning/script/ansible-start.groovy b/smardigo/provisioning/script/ansible-start.groovy
index eb47d52..6c15aa2 100644
--- a/smardigo/provisioning/script/ansible-start.groovy
+++ b/smardigo/provisioning/script/ansible-start.groovy
@@ -12,7 +12,9 @@ def env = [
scope_id: contextScopeId,
smardigo_management_action: smardigoManagementAction,
stage: cluster.stage,
- tenant_id: tenant.key
+ tenant_id: tenant.key,
+ connect_client_admin_password: connect_admin_password,
+ connect_realm_admin_password: keycloak_admin_password
]
if (binding.hasVariable('extraVariables')) {
env << extraVariables
diff --git a/smardigo/provisioning/script/create-awx-paramaters.groovy b/smardigo/provisioning/script/create-awx-paramaters.groovy
index 471b7c2..385ebd4 100644
--- a/smardigo/provisioning/script/create-awx-paramaters.groovy
+++ b/smardigo/provisioning/script/create-awx-paramaters.groovy
@@ -12,7 +12,9 @@ def env = [
scope_id: contextScopeId,
smardigo_management_action: smardigoManagementAction,
stage: cluster.stage,
- tenant_id: tenant.key
+ tenant_id: tenant.key,
+ connect_client_admin_password: connect_admin_password,
+ connect_realm_admin_password: keycloak_admin_password
]
if (binding.hasVariable('extraVariables')) {
env << extraVariables
diff --git a/smardigo/provisioning/script/create-password.groovy b/smardigo/provisioning/script/create-password.groovy
index 49a9dcc..05b0364 100644
--- a/smardigo/provisioning/script/create-password.groovy
+++ b/smardigo/provisioning/script/create-password.groovy
@@ -7,14 +7,14 @@ def special = ['~','!','#','%','&','(',')','{','}','[',']','-','+']
def pool = digits + upperCase + lowerCase + special
Random rand = new Random(System.currentTimeMillis());
-def passChars = (0..pool_length - 1).collect { pool[rand.nextInt(pool.size)] };
-passChars[0] = special[rand.nextInt(special.size)]
-passChars[pool_length - 0] = special[rand.nextInt(special.size)]
-passChars[1] = upperCase[rand.nextInt(upperCase.size)]
-passChars[pool_length - 1] = upperCase[rand.nextInt(upperCase.size)]
-passChars[2] = lowerCase[rand.nextInt(lowerCase.size)]
-passChars[pool_length - 2] = lowerCase[rand.nextInt(lowerCase.size)]
+def passChars = (0..pool_length - 1).collect { pool[rand.nextInt(pool.size())] };
+passChars[0] = special[rand.nextInt(special.size())]
+passChars[pool_length - 0] = special[rand.nextInt(special.size())]
+passChars[1] = upperCase[rand.nextInt(upperCase.size())]
+passChars[pool_length - 1] = upperCase[rand.nextInt(upperCase.size())]
+passChars[2] = lowerCase[rand.nextInt(lowerCase.size())]
+passChars[pool_length - 2] = lowerCase[rand.nextInt(lowerCase.size())]
-def PASSWORD = passChars.join();
+def PASSWORD = passChars.join('');
PASSWORD
\ No newline at end of file